Add initial caching support