Added $cacheFactory and Cache objects