Improve cacheability and rendering

Closes #3598935

Merge request reports

Loading