All caches should work now - minimally tested