Improve caching

Boris Doesborgrequested to merge
issue/path_file-3228300:3228300-controller-caching into 2.1.x

Closes #3228300

Merge request reports