improved cache (and related) testing