CacheQuery is added.
Building mechanism for the caches updated with searching and indexing
utilities.
tests are updated due to changes in the builder.