Use the cache when the download times out

Attempt to mitigate https://github.com/ocaml/ocaml.org/issues/358
Merge branch 'master' of https://github.com/ocaml/ocaml.org