improved caching
cache improvements
cache improvements