Append $os and $arch to the names of cached setup exes. 

Fixes #1226.