Merge "use the original hit if the cache is killed"