Cache amd deps more efficiently, 0.20.1