Expose underlying cache and beef up tests a bit