Changes to caching, still problems