Updates queries to hand off caching to event handler