Merge pull request #7319 from jvanbaarsen/small-eventcache-refactoring

Moved some behaviour to one place