caching commented out but seemingly functional.  needs invalidation and: here come the tests!