Caching obstacles, performance fixes