various minor cache-related fixes and tweaks

Merge request reports

Loading