Simplify caching.
Merge pull request #2377 from guardian/super-cache

Super cache