Change scope from cachier to machine

When sharing the cache using the box scope there are sometimes
issues when running a multi machine environment.

Change-Id: I685e9c66db7465105b4dd0403b9aaa34aa4ae431
Merge "Change scope from cachier to machine"