Merge pull request #7054 from guardian/cache-times

Permanently switch on shorter cache time.
Merge branch 'master' of github.com:guardian/frontend into formstack