updated caching methods