* Revert "Revert "Make artifact downloading more robust for flaky networks" (#13995)"

This reverts commit 33d8a035.

* Use subdirectories to organize cached files

* Fix unauthorized import