Fix double-marshalling of cachefrom#1086

KostyaSha merged 2 commits intodocker-java:masterdocker-java/docker-java:masterfrom

exFalso:masterexFalso/docker-java:masterCopy head branch name to clipboard