Add more cache contexts to prevent cache redirect error

Closes #3526098

Merge request reports

Loading