more event caching cleanup