tweaks in caching mechanism