Add caching support