Issue #34: CachedQueries apear to be on done...