DELTASPIKE-307 improved cache