more caching fixup