Adding caching support.