Issue #3527692 by mably: Cache handling improvements

Closes #3527692

Merge request reports

Loading