diff --git a/client/build.go b/client/build.go
index 537a53be..4cb91d7a 100644
--- a/client/build.go
+++ b/client/build.go
@@ -51,9 +51,7 @@ func (c *Client) Build(ctx context.Context, opt SolveOpt, product string, buildF
 			return err
 		}
 
-		if c, ok := g.(gateway.Client); ok {
-			gwClient.caps = c.BuildOpts().Caps
-		}
+		gwClient.caps = g.BuildOpts().Caps
 
 		if err := g.Run(ctx, buildFunc); err != nil {
 			return errors.Wrap(err, "failed to run Build function")
diff --git a/frontend/gateway/grpcclient/client.go b/frontend/gateway/grpcclient/client.go
index e0516d79..74c7cdcd 100644
--- a/frontend/gateway/grpcclient/client.go
+++ b/frontend/gateway/grpcclient/client.go
@@ -35,6 +35,7 @@ import (
 const frontendPrefix = "BUILDKIT_FRONTEND_OPT_"
 
 type GrpcClient interface {
+	client.Client
 	Run(context.Context, client.BuildFunc) error
 }