Added caching service and factory.