Activate bundler caching
Merge branch 'master' into future