Re added what Imbar changed on my caching method.