Readded CachedQuery.java