Caching is unnecessary
Merge branch 'master' into heroku