Remove duplicate (upload) squids, update cache list with reality

Change-Id: Ib797c66a805e765d771ded4d1c5941d216a6a9a5