Fixed cache keying, clear cache every test