Given that we don't actually expose this Cache interface anymore, I think we can get rid of it and just run against the Map.