Really use the cache
Merge branch 'release/cache'