Revert "Cache more stuff"

This reverts commit 0a36d86dff4bdf11682d91ef9a2f689b580676cd.