Revert "Cache it the dumb way"

This reverts commit daa707e27831d621c8f6ab88866b633535051a00.