Updated for caching support