Merge branch 'jg/credential-cache-chdir-to-sockdir'