extended clientside to include new query caching