Revert "Caching hack"

This reverts commit ef5448559831688840fdb245610816b9b3df4969.