extending cache to 5 minutes for searches and removing race condition
Merge branch 'master' of heroku.com:mel-catcher