I think this cache also needs the isRemoved check.