DELTASPIKE-288 improved caching