Caching related changes

Merged Ruben Vorderman requested to merge BIOWDL-25 into master

Created by: DavyCats

Merge request reports