Revert "Moved caching earlier"

This reverts commit 7aef60297aa6ef042e1e163642de45a41c248c5b.