more caching bugs fixed