Fix removal of cache items