TEST: add caching, and solo unit tests