Added the caching support.