Revert "Take 2, I hate caching"

This reverts commit 71b25c03cd1fb254ce6bdfef1b684988c9a8a465.