have almosted managed cached queries completely
final tweaks to knock out caching