Improve caching

Closes #3228300

Merge request reports

Loading