Replaced Caching Mediator with Cached Query