Add caching support.