Fix/global caching compositional models

Merged Timo Koch requested to merge fix/global-caching-compositional-models into next

Merge request reports