Increased caching time to 1 week.
Merge branch 'master' into staging
Merge branch 'staging' into prod