Add new cache context

Closes #3610368

Merge request reports

Loading