swift-add-drive: discard preserved cache

Change-Id: I51699a4dc3abcdb6384bce6b1d464eddc7c8a591
swift-add-drive: clarify when waiting for a disk

Change-Id: Ic6eb12541c6cc77a7f563f32c62e800573cfbafc