Improved CacheWrapper + cacheWrapper example