Revert "Add some caching, will need to be busted some day"

This reverts commit fe6d897a97f6f7161e6ff3585194bdd660eb6632.