Correct the fix for only deleting non-active cache items.  Had forgotten the one_removed flag in previous check-in.