Changed some caching in preparation for gearman scheduled caching