revert the query caching stuff, it's already just a function, no need to shadow it in another ns under a multimethod