Adding new checks for dropping cache