Fix failing tests which refer to the now missing FileCacheStore