You know, the caching really only comes to play in the tests. I so wanna get rid of the global-ish state here, but that's for another PR as well.