Revert "Merge branch 'caching' into 'master'"

This reverts merge request !6
1 job for revert-cfa5008c in 13 minutes and 32 seconds (queued for 4 seconds)