fixup! WIP: move caches to own files