Add caching and DB index to events
Merge pull request #2361 from jgmize/events-performance-enhancement

Add caching and DB index to events