diff --git a/core/coreapi/dht.go b/core/coreapi/dht.go
index 7c1b1327ef8..0585fdb860b 100644
--- a/core/coreapi/dht.go
+++ b/core/coreapi/dht.go
@@ -103,9 +103,8 @@ func provideKeysRec(ctx context.Context, r routing.IpfsRouting, bs blockstore.Bl
 
 	errCh := make(chan error)
 	go func() {
+		dserv := dag.NewDAGService(blockservice.New(bs, offline.Exchange(bs)))
 		for _, c := range cids {
-			dserv := dag.NewDAGService(blockservice.New(bs, offline.Exchange(bs)))
-
 			err := dag.EnumerateChildrenAsync(ctx, dag.GetLinksDirect(dserv), c, provided.Visitor(ctx))
 			if err != nil {
 				errCh <- err
diff --git a/core/coreapi/dht_test.go b/core/coreapi/dht_test.go
index e7555db15d6..759835b567f 100644
--- a/core/coreapi/dht_test.go
+++ b/core/coreapi/dht_test.go
@@ -51,7 +51,7 @@ func TestDhtFindProviders(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	out, err := apis[2].Dht().FindProviders(ctx, p, options.Dht.WithNumProviders(1))
+	out, err := apis[2].Dht().FindProviders(ctx, p, options.Dht.NumProviders(1))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -80,7 +80,7 @@ func TestDhtProvide(t *testing.T) {
 	nds[0].Blockstore.Put(b)
 	p := iface.IpfsPath(b.Cid())
 
-	out, err := apis[2].Dht().FindProviders(ctx, p, options.Dht.WithNumProviders(1))
+	out, err := apis[2].Dht().FindProviders(ctx, p, options.Dht.NumProviders(1))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -96,7 +96,7 @@ func TestDhtProvide(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	out, err = apis[2].Dht().FindProviders(ctx, p, options.Dht.WithNumProviders(1))
+	out, err = apis[2].Dht().FindProviders(ctx, p, options.Dht.NumProviders(1))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/core/coreapi/interface/options/dht.go b/core/coreapi/interface/options/dht.go
index f989fa5e785..e13e1602006 100644
--- a/core/coreapi/interface/options/dht.go
+++ b/core/coreapi/interface/options/dht.go
@@ -43,18 +43,18 @@ type dhtOpts struct{}
 
 var Dht dhtOpts
 
-// WithRecursive is an option for Dht.Provide which specifies whether to provide
+// Recursive is an option for Dht.Provide which specifies whether to provide
 // the given path recursively
-func (dhtOpts) WithRecursive(recursive bool) DhtProvideOption {
+func (dhtOpts) Recursive(recursive bool) DhtProvideOption {
 	return func(settings *DhtProvideSettings) error {
 		settings.Recursive = recursive
 		return nil
 	}
 }
 
-// WithNumProviders is an option for Dht.FindProviders which specifies the
+// NumProviders is an option for Dht.FindProviders which specifies the
 // number of peers to look for. Default is 20
-func (dhtOpts) WithNumProviders(numProviders int) DhtFindProvidersOption {
+func (dhtOpts) NumProviders(numProviders int) DhtFindProvidersOption {
 	return func(settings *DhtFindProvidersSettings) error {
 		settings.NumProviders = numProviders
 		return nil