Change remove cache file behavior