diff --git a/cache/remotecache/v1/cachestorage.go b/cache/remotecache/v1/cachestorage.go
index fe5173935..605b6d634 100644
--- a/cache/remotecache/v1/cachestorage.go
+++ b/cache/remotecache/v1/cachestorage.go
@@ -254,7 +254,7 @@ func (cs *cacheResultStorage) Load(ctx context.Context, res solver.CacheResult)
 
 	ref, err := cs.w.FromRemote(ctx, item.result)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to load result from remote")
+		return nil, errors.Wrap(err, "failed to load result from remote")
 	}
 	return worker.NewWorkerRefResult(ref, cs.w), nil
 }
diff --git a/solver/edge.go b/solver/edge.go
index f1b57ec98..b809652c4 100644
--- a/solver/edge.go
+++ b/solver/edge.go
@@ -332,7 +332,7 @@ func (e *edge) unpark(incoming []pipe.Sender, updates, allPipes []pipe.Receiver,
 		index := e.cacheMapIndex
 		e.cacheMapReq = f.NewFuncRequest(func(ctx context.Context) (interface{}, error) {
 			cm, err := e.op.CacheMap(ctx, index)
-			return cm, errors.Wrapf(err, "failed to load cache key")
+			return cm, errors.Wrap(err, "failed to load cache key")
 		})
 		cacheMapReq = true
 	}
@@ -800,7 +800,7 @@ func (e *edge) createInputRequests(desiredState edgeStatusType, f *pipeFactory,
 			func(fn ResultBasedCacheFunc, res Result, index Index) {
 				dep.slowCacheReq = f.NewFuncRequest(func(ctx context.Context) (interface{}, error) {
 					v, err := e.op.CalcSlowCache(ctx, index, fn, res)
-					return v, errors.Wrapf(err, "failed to compute cache key")
+					return v, errors.Wrap(err, "failed to compute cache key")
 				})
 			}(fn, res, dep.index)
 			addedNew = true
@@ -852,7 +852,7 @@ func (e *edge) loadCache(ctx context.Context) (interface{}, error) {
 	logrus.Debugf("load cache for %s with %s", e.edge.Vertex.Name(), rec.ID)
 	res, err := e.op.LoadCache(ctx, rec)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to load cache")
+		return nil, errors.Wrap(err, "failed to load cache")
 	}
 
 	return NewCachedResult(res, []ExportableCacheKey{{CacheKey: rec.key, Exporter: &exporter{k: rec.key, record: rec, edge: e}}}), nil
diff --git a/solver/llbsolver/bridge.go b/solver/llbsolver/bridge.go
index c55ff167c..e5d362d80 100644
--- a/solver/llbsolver/bridge.go
+++ b/solver/llbsolver/bridge.go
@@ -94,11 +94,11 @@ func (b *llbBridge) Solve(ctx context.Context, req frontend.SolveRequest) (res *
 
 		edge, err := Load(req.Definition, ValidateEntitlements(ent), WithCacheSources(cms), RuntimePlatforms(b.platforms), WithValidateCaps())
 		if err != nil {
-			return nil, errors.Wrapf(err, "failed to load LLB")
+			return nil, errors.Wrap(err, "failed to load LLB")
 		}
 		ref, err := b.builder.Build(ctx, edge)
 		if err != nil {
-			return nil, errors.Wrapf(err, "failed to build LLB")
+			return nil, errors.Wrap(err, "failed to build LLB")
 		}
 
 		res = &frontend.Result{Ref: ref}