Feature/restructure fluxvarscache

Merged Timo Koch requested to merge feature/restructure-fluxvarscache into next

Merge request reports