fixed caching methods