Improved caching behaviour