diff --git a/bake/bake.go b/bake/bake.go
index 2e44af4f..f6a80cbb 100644
--- a/bake/bake.go
+++ b/bake/bake.go
@@ -3,7 +3,6 @@ package bake
 import (
 	"context"
 	"io/ioutil"
-	"os"
 	"path"
 	"strings"
 
@@ -299,7 +298,7 @@ func toBuildOpt(t Target, noCache, pull bool) (*build.Options, error) {
 	}
 	bo.Platforms = platforms
 
-	bo.Session = append(bo.Session, authprovider.NewDockerAuthProvider(os.Stderr))
+	bo.Session = append(bo.Session, authprovider.NewDockerAuthProvider())
 
 	secrets, err := build.ParseSecretSpecs(t.Secrets)
 	if err != nil {
diff --git a/commands/build.go b/commands/build.go
index e3275b17..f686250c 100644
--- a/commands/build.go
+++ b/commands/build.go
@@ -102,7 +102,7 @@ func runBuild(dockerCli command.Cli, in buildOptions) error {
 	}
 	opts.Platforms = platforms
 
-	opts.Session = append(opts.Session, authprovider.NewDockerAuthProvider(os.Stderr))
+	opts.Session = append(opts.Session, authprovider.NewDockerAuthProvider())
 
 	secrets, err := build.ParseSecretSpecs(in.secrets)
 	if err != nil {
diff --git a/go.mod b/go.mod
index 6a417d3c..7e2ca662 100644
--- a/go.mod
+++ b/go.mod
@@ -26,7 +26,6 @@ require (
 	github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-metrics v0.0.0-20170502235133-d466d4f6fd96 // indirect
-	github.com/docker/go-units v0.3.1
 	github.com/docker/libtrust v0.0.0-20150526203908-9cbd2a1374f4 // indirect
 	github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
diff --git a/go.sum b/go.sum
index b1ffc872..57b7e08d 100644
--- a/go.sum
+++ b/go.sum
@@ -184,8 +184,6 @@ github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQz
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/moby/buildkit v0.5.1 h1:a2JHgsMuN/KGafhNK+AxmAIIov9itJTT4z3TyFTSE4c=
 github.com/moby/buildkit v0.5.1/go.mod h1:MlzfF7dLLq+tMiE5Dt8qD2iwXvZa1OnwWxMZX/wjBWs=
-github.com/moby/buildkit v0.5.2-0.20190513182223-f238f1efb04f h1:gNiytoQ3/71JJKWbLPtxoInde5kBRpvqH6EbUf12JDU=
-github.com/moby/buildkit v0.5.2-0.20190513182223-f238f1efb04f/go.mod h1:RozsxlEOjPuX/zKKrd0ZS76dlVNZu4qAff+vj7hR/qs=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
diff --git a/vendor/github.com/moby/buildkit/client/solve.go b/vendor/github.com/moby/buildkit/client/solve.go
index 17b3810c..830c018c 100644
--- a/vendor/github.com/moby/buildkit/client/solve.go
+++ b/vendor/github.com/moby/buildkit/client/solve.go
@@ -410,6 +410,9 @@ func parseCacheOptions(opt SolveOpt) (*cacheOptions, error) {
 			if csDir == "" {
 				return nil, errors.New("local cache importer requires src")
 			}
+			if err := os.MkdirAll(csDir, 0755); err != nil {
+				return nil, err
+			}
 			cs, err := contentlocal.NewStore(csDir)
 			if err != nil {
 				return nil, err
diff --git a/vendor/github.com/moby/buildkit/frontend/gateway/grpcclient/client.go b/vendor/github.com/moby/buildkit/frontend/gateway/grpcclient/client.go
index b39b2808..c9f43734 100644
--- a/vendor/github.com/moby/buildkit/frontend/gateway/grpcclient/client.go
+++ b/vendor/github.com/moby/buildkit/frontend/gateway/grpcclient/client.go
@@ -28,8 +28,6 @@ type GrpcClient interface {
 }
 
 func New(ctx context.Context, opts map[string]string, session, product string, c pb.LLBBridgeClient, w []client.WorkerInfo) (GrpcClient, error) {
-	ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
-	defer cancel()
 	resp, err := c.Ping(ctx, &pb.PingRequest{})
 	if err != nil {
 		return nil, err
diff --git a/vendor/github.com/moby/buildkit/session/auth/authprovider/authprovider.go b/vendor/github.com/moby/buildkit/session/auth/authprovider/authprovider.go
index a7eb6f22..7df33cca 100644
--- a/vendor/github.com/moby/buildkit/session/auth/authprovider/authprovider.go
+++ b/vendor/github.com/moby/buildkit/session/auth/authprovider/authprovider.go
@@ -2,7 +2,7 @@ package authprovider
 
 import (
 	"context"
-	"io"
+	"io/ioutil"
 	"sync"
 
 	"github.com/docker/cli/cli/config"
@@ -12,9 +12,9 @@ import (
 	"google.golang.org/grpc"
 )
 
-func NewDockerAuthProvider(stderr io.Writer) session.Attachable {
+func NewDockerAuthProvider() session.Attachable {
 	return &authProvider{
-		config: config.LoadDefaultConfigFile(stderr),
+		config: config.LoadDefaultConfigFile(ioutil.Discard),
 	}
 }
 
diff --git a/vendor/github.com/moby/buildkit/session/grpchijack/dial.go b/vendor/github.com/moby/buildkit/session/grpchijack/dial.go
index 2486563e..151ab549 100644
--- a/vendor/github.com/moby/buildkit/session/grpchijack/dial.go
+++ b/vendor/github.com/moby/buildkit/session/grpchijack/dial.go
@@ -46,7 +46,6 @@ type conn struct {
 
 	closedOnce sync.Once
 	readMu     sync.Mutex
-	writeMu    sync.Mutex
 	err        error
 	closeCh    chan struct{}
 }
@@ -80,8 +79,6 @@ func (c *conn) Read(b []byte) (n int, err error) {
 }
 
 func (c *conn) Write(b []byte) (int, error) {
-	c.writeMu.Lock()
-	defer c.writeMu.Unlock()
 	m := &controlapi.BytesMessage{Data: b}
 	if err := c.stream.SendMsg(m); err != nil {
 		return 0, err
@@ -96,9 +93,7 @@ func (c *conn) Close() (err error) {
 		}()
 
 		if cs, ok := c.stream.(grpc.ClientStream); ok {
-			c.writeMu.Lock()
 			err = cs.CloseSend()
-			c.writeMu.Unlock()
 			if err != nil {
 				return
 			}
@@ -111,7 +106,6 @@ func (c *conn) Close() (err error) {
 			err = c.stream.RecvMsg(m)
 			if err != nil {
 				if err != io.EOF {
-					c.readMu.Unlock()
 					return
 				}
 				err = nil
diff --git a/vendor/github.com/moby/buildkit/session/manager.go b/vendor/github.com/moby/buildkit/session/manager.go
index e01b047e..f401c7fb 100644
--- a/vendor/github.com/moby/buildkit/session/manager.go
+++ b/vendor/github.com/moby/buildkit/session/manager.go
@@ -162,9 +162,7 @@ func (sm *Manager) Get(ctx context.Context, id string) (Caller, error) {
 	go func() {
 		select {
 		case <-ctx.Done():
-			sm.mu.Lock()
 			sm.updateCondition.Broadcast()
-			sm.mu.Unlock()
 		}
 	}()
 
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 4ae93421..edcd0bcd 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -259,7 +259,7 @@ github.com/matttproud/golang_protobuf_extensions/pbutil
 github.com/miekg/pkcs11
 # github.com/mitchellh/mapstructure v1.1.2
 github.com/mitchellh/mapstructure
-# github.com/moby/buildkit v0.5.2-0.20190513182223-f238f1efb04f
+# github.com/moby/buildkit v0.5.1
 github.com/moby/buildkit/session/auth/authprovider
 github.com/moby/buildkit/client
 github.com/moby/buildkit/session