Working on query caching / improve observing.