Caching tweaks

Oh the humanity