diff --git a/vault/core.go b/vault/core.go
index 9570ac50d..b178194f0 100644
--- a/vault/core.go
+++ b/vault/core.go
@@ -319,7 +319,7 @@ type Core struct {
 	// Lock for the cluster leader values
 	clusterLeaderParamsLock sync.RWMutex
 	// Info on cluster members
-	peerClusterAddrsCache *cache.Cache
+	clusterPeerClusterAddrsCache *cache.Cache
 	// The grpc Server that handles server RPC calls
 	rpcServer *grpc.Server
 	// The context for the client
@@ -447,7 +447,7 @@ func NewCore(conf *CoreConfig) (*Core, error) {
 		clusterName:                      conf.ClusterName,
 		clusterListenerShutdownCh:        make(chan struct{}),
 		clusterListenerShutdownSuccessCh: make(chan struct{}),
-		peerClusterAddrsCache:            cache.New(3*heartbeatInterval, time.Second),
+		clusterPeerClusterAddrsCache:     cache.New(3*heartbeatInterval, time.Second),
 		enableMlock:                      !conf.DisableMlock,
 	}
 
diff --git a/vault/request_forwarding.go b/vault/request_forwarding.go
index 04b846e90..e3c17ea77 100644
--- a/vault/request_forwarding.go
+++ b/vault/request_forwarding.go
@@ -364,7 +364,7 @@ func (s *forwardedRequestRPCServer) ForwardRequest(ctx context.Context, freq *fo
 
 func (s *forwardedRequestRPCServer) Echo(ctx context.Context, in *EchoRequest) (*EchoReply, error) {
 	if in.ClusterAddr != "" {
-		s.core.peerClusterAddrsCache.Set(in.ClusterAddr, nil, 0)
+		s.core.clusterPeerClusterAddrsCache.Set(in.ClusterAddr, nil, 0)
 	}
 	return &EchoReply{
 		Message: "pong",