Add caching to events and fix references to event dates