all: sync with master

internal/next/cmd/opt.go

@@ -10,6 +10,7 @@ import (
 	"os"
 	"strings"
 
+	"github.com/AdguardTeam/AdGuardHome/internal/configmigrate"
 	"github.com/AdguardTeam/AdGuardHome/internal/next/configmgr"
 	"github.com/AdguardTeam/AdGuardHome/internal/version"
 	"github.com/AdguardTeam/golibs/log"
@@ -382,7 +383,7 @@ func processOptions(
 
 	if opts.version {
 		if opts.verbose {
-			fmt.Println(version.Verbose())
+			fmt.Print(version.Verbose(configmigrate.LastSchemaVersion))
 		} else {
 			fmt.Printf("AdGuard Home %s\n", version.Version())
 		}

internal/next/dnssvc/dnssvc.go

@@ -110,7 +110,7 @@ func addressesToUpstreams(
 	// TODO(e.burkov):  Add system hosts resolver here.
 	var bootstrap upstream.ParallelResolver
 	for _, r := range boots {
-		bootstrap = append(bootstrap, r)
+		bootstrap = append(bootstrap, upstream.NewCachingResolver(r))
 	}
 
 	upstreams = make([]upstream.Upstream, len(upsStrs))