Cache row removal fix