Added new caching strategy