Add caching and DB index to events