Fix to avoid snapshot cache