fix cache workfile collision between versions
Merge pull request #1399 from jvdp/versioned-workfile

Fix cache workfile collision between versions