DEVIDM-105: Removed cache from query classes
DEVIDM-105: Removed reference to EhCacheManager
DEVIDM-105: Removed the cache since we don't use it.
DEVIDM-105: Removed all references to ehcache