Changed caching behavior to fix CORE-156