B235 Patch 2.1

Update to fix issue with query caching system attempting to load cache
when it shouldnt be.