diff --git a/command.go b/command.go
index c1cbee0d8..4f309140f 100644
--- a/command.go
+++ b/command.go
@@ -3414,7 +3414,7 @@ type CommandInfo struct {
 	LastKeyPos  int8
 	StepCount   int8
 	ReadOnly    bool
-	Tips        map[string]string
+	Tips        *routing.CommandPolicy
 }
 
 type CommandsInfoCmd struct {
@@ -3547,8 +3547,7 @@ func (cmd *CommandsInfoCmd) readReply(rd *proto.Reader) error {
 				return err
 			}
 
-			cmdInfo.Tips = make(map[string]string, tipsLen)
-
+			rawTips := make(map[string]string, tipsLen)
 			for f := 0; f < tipsLen; f++ {
 				tip, err := rd.ReadString()
 				if err != nil {
@@ -3557,7 +3556,7 @@ func (cmd *CommandsInfoCmd) readReply(rd *proto.Reader) error {
 
 				// Handle tips that don't have a colon (like "nondeterministic_output")
 				if !strings.Contains(tip, ":") {
-					cmdInfo.Tips[tip] = ""
+					rawTips[tip] = ""
 					continue
 				}
 
@@ -3566,8 +3565,9 @@ func (cmd *CommandsInfoCmd) readReply(rd *proto.Reader) error {
 				if !ok {
 					return fmt.Errorf("redis: unexpected tip %q in COMMAND reply", tip)
 				}
-				cmdInfo.Tips[k] = v
+				rawTips[k] = v
 			}
+			cmdInfo.Tips = parseCommandPolicies(rawTips)
 
 			if err := rd.DiscardNext(); err != nil {
 				return err
@@ -3620,47 +3620,33 @@ func (c *cmdsInfoCache) Get(ctx context.Context) (map[string]*CommandInfo, error
 }
 
 // ------------------------------------------------------------------------------
-var BuiltinPolicies = map[string]routing.CommandPolicy{
-	"ft.create": {Request: routing.ReqSpecial, Response: routing.RespAllSucceeded},
-	"ft.alter":  {Request: routing.ReqSpecial, Response: routing.RespAllSucceeded},
-	"ft.drop":   {Request: routing.ReqSpecial, Response: routing.RespAllSucceeded},
-
-	"mset": {Request: routing.ReqMultiShard, Response: routing.RespAllSucceeded},
-	"mget": {Request: routing.ReqMultiShard, Response: routing.RespSpecial},
-	"del":  {Request: routing.ReqMultiShard, Response: routing.RespAggSum},
-}
-
-func newCommandPolicies(commandInfo map[string]*CommandInfo) map[string]routing.CommandPolicy {
-
-	table := make(map[string]routing.CommandPolicy, len(commandInfo))
+const requestPolicy = "request_policy"
+const responsePolicy = "response_policy"
 
-	for name, info := range commandInfo {
-		req := routing.ReqDefault
-		resp := routing.RespAllSucceeded
+func parseCommandPolicies(commandInfoTips map[string]string) *routing.CommandPolicy {
+	req := routing.ReqDefault
+	resp := routing.RespAllSucceeded
 
-		if tips := info.Tips; tips != nil {
-			if v, ok := tips["request_policy"]; ok {
-				if p, err := routing.ParseRequestPolicy(v); err == nil {
-					req = p
-				}
+	if commandInfoTips != nil {
+		if v, ok := commandInfoTips[requestPolicy]; ok {
+			if p, err := routing.ParseRequestPolicy(v); err == nil {
+				req = p
 			}
-			if v, ok := tips["response_policy"]; ok {
-				if p, err := routing.ParseResponsePolicy(v); err == nil {
-					resp = p
-				}
+		}
+		if v, ok := commandInfoTips[responsePolicy]; ok {
+			if p, err := routing.ParseResponsePolicy(v); err == nil {
+				resp = p
 			}
-		} else {
-			return BuiltinPolicies
 		}
-		table[name] = routing.CommandPolicy{Request: req, Response: resp}
 	}
-
-	if len(table) == 0 {
-		for k, v := range BuiltinPolicies {
-			table[k] = v
+	tips := make(map[string]string, len(commandInfoTips))
+	for k, v := range commandInfoTips {
+		if k == requestPolicy || k == responsePolicy {
+			continue
 		}
+		tips[k] = v
 	}
-	return table
+	return &routing.CommandPolicy{Request: req, Response: resp, Tips: tips}
 }
 
 //------------------------------------------------------------------------------
diff --git a/commands_test.go b/commands_test.go
index 8a2b9a1be..1329f73a0 100644
--- a/commands_test.go
+++ b/commands_test.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/redis/go-redis/v9"
 	"github.com/redis/go-redis/v9/internal/proto"
+	"github.com/redis/go-redis/v9/internal/routing"
 )
 
 type TimeValue struct {
@@ -664,13 +665,13 @@ var _ = Describe("Commands", func() {
 
 			cmd := cmds["touch"]
 			Expect(cmd.Name).To(Equal("touch"))
-			Expect(cmd.Tips["request_policy"]).To(Equal("multi_shard"))
-			Expect(cmd.Tips["response_policy"]).To(Equal("agg_sum"))
+			Expect(cmd.Tips.Request).To(Equal(routing.ReqMultiShard))
+			Expect(cmd.Tips.Response).To(Equal(routing.RespAggSum))
 
 			cmd = cmds["flushall"]
 			Expect(cmd.Name).To(Equal("flushall"))
-			Expect(cmd.Tips["request_policy"]).To(Equal("all_shards"))
-			Expect(cmd.Tips["response_policy"]).To(Equal("all_succeeded"))
+			Expect(cmd.Tips.Request).To(Equal(routing.ReqAllShards))
+			Expect(cmd.Tips.Response).To(Equal(routing.RespAllSucceeded))
 		})
 
 		It("should return all command names", func() {
diff --git a/internal/routing/policy.go b/internal/routing/policy.go
index e403067c0..18c03cd2d 100644
--- a/internal/routing/policy.go
+++ b/internal/routing/policy.go
@@ -115,4 +115,7 @@ func ParseResponsePolicy(raw string) (ResponsePolicy, error) {
 type CommandPolicy struct {
 	Request  RequestPolicy
 	Response ResponsePolicy
+	// Tips that are not request_policy or response_policy
+	// e.g nondeterministic_output, nondeterministic_output_order.
+	Tips map[string]string
 }
diff --git a/osscluster.go b/osscluster.go
index 65e0e4a17..6af73aa2b 100644
--- a/osscluster.go
+++ b/osscluster.go
@@ -19,7 +19,6 @@ import (
 	"github.com/redis/go-redis/v9/internal/pool"
 	"github.com/redis/go-redis/v9/internal/proto"
 	"github.com/redis/go-redis/v9/internal/rand"
-	"github.com/redis/go-redis/v9/internal/routing"
 )
 
 const (
@@ -913,11 +912,10 @@ func (c *clusterStateHolder) ReloadOrGet(ctx context.Context) (*clusterState, er
 // or more underlying connections. It's safe for concurrent use by
 // multiple goroutines.
 type ClusterClient struct {
-	opt             *ClusterOptions
-	nodes           *clusterNodes
-	state           *clusterStateHolder
-	cmdsInfoCache   *cmdsInfoCache
-	commandPolicies map[string]routing.CommandPolicy
+	opt           *ClusterOptions
+	nodes         *clusterNodes
+	state         *clusterStateHolder
+	cmdsInfoCache *cmdsInfoCache
 	cmdable
 	hooksMixin
 }
@@ -934,7 +932,6 @@ func NewClusterClient(opt *ClusterOptions) *ClusterClient {
 
 	c.state = newClusterStateHolder(c.loadState)
 	c.cmdsInfoCache = newCmdsInfoCache(c.cmdsInfo)
-	c.commandPolicies = newCommandPolicies(c.cmdsInfoCache.cmds)
 	c.cmdable = c.Process
 	c.initHooks(hooks{
 		dial:       nil,