Stop using factory to use cache.