decrease cache time to 9 minutes
Merge remote-tracking branch 'heroku/master'