Revert "remove caching in dev"

This reverts commit 63a15b6001867183f41ddc55e8223a3800b3f9e4.