* Fixes for query cache feature
* Tests for query cache
* Test-Stubs added for non-covered code
* Minor cleanup