I think I have query caching working now.