Added caching support.