Avoid copy, extract directly into cache folder

[bryanmacfarlane]

We can avoid the cp from temp to cache and extract directly into the cache folder

[gennsp]

@stephenmichaelf # @bryanmacfarlane @olleolleolle @olleolleolle @jamesottaway blocked revoked