Added CacheFactoryService and SimpleCache