DELTASPIKE-340 remove null check now that we always return a event
DELTASPIKE-307 improved cache