Fixes up the tests with changes to cache helper