diff --git a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeCacheHealthIndicator.java b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeCacheHealthIndicator.java
index 5fde8e39..f4b9cb71 100644
--- a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeCacheHealthIndicator.java
+++ b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeCacheHealthIndicator.java
@@ -106,8 +106,8 @@ public class GeodeCacheHealthIndicator extends AbstractGeodeHealthIndicator {
 
 	private Function<Health.Builder, Health.Builder> withCacheDetails() {
 
-		return healthBuilder -> healthBuilder.withDetail("geode.cache.closed",
-				getGemFireCache().filter(GemFireCache::isClosed).isPresent() ? "Yes" : "No")
+		return healthBuilder -> healthBuilder.withDetail("geode.cache.name", getGemFireCache().map(GemFireCache::getName).orElse(""))
+				.withDetail("geode.cache.closed", getGemFireCache().map(GemFireCache::isClosed).map(this::toYesNoString).orElse("Yes"))
 			.withDetail("geode.cache.cancel-in-progress", getGemFireCache()
 				.map(GemFireCache::getCancelCriterion)
 				.filter(CancelCriterion::isCancelInProgress)
@@ -134,8 +134,8 @@ public class GeodeCacheHealthIndicator extends AbstractGeodeHealthIndicator {
 		return healthBuilder -> getGemFireCache()
 			.map(GemFireCache::getDistributedSystem)
 			.map(distributedSystem -> healthBuilder
-				.withDetail("geode.distributed-system.connection", distributedSystem.isConnected() ? "Connected" : "Disconnected")
-				.withDetail("geode.distributed-system.reconnecting", distributedSystem.isReconnecting() ? "Yes" : "No")
+				.withDetail("geode.distributed-system.connection", toConnectedNoConnectedString(distributedSystem.isConnected()))
+				.withDetail("geode.distributed-system.reconnecting", toYesNoString(distributedSystem.isReconnecting()))
 				.withDetail("geode.distributed-system.properties-location",
 					Optional.ofNullable(DistributedSystem.getPropertiesFileURL()).map(URL::toExternalForm))
 				.withDetail("geode.distributed-system.security-properties-location",
@@ -156,4 +156,8 @@ public class GeodeCacheHealthIndicator extends AbstractGeodeHealthIndicator {
 			)
 			.orElse(healthBuilder);
 	}
+
+	private String toConnectedNoConnectedString(Boolean connected) {
+		return Boolean.TRUE.equals(connected) ? "Connected" : "Not Connected";
+	}
 }
diff --git a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeCacheHealthIndicatorUnitTests.java b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeCacheHealthIndicatorUnitTests.java
index ba76f0d2..8928e5b4 100644
--- a/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeCacheHealthIndicatorUnitTests.java
+++ b/spring-geode-actuator/src/test/java/org/springframework/geode/boot/actuate/GeodeCacheHealthIndicatorUnitTests.java
@@ -108,6 +108,7 @@ public class GeodeCacheHealthIndicatorUnitTests {
 
 		assertThat(healthDetails).isNotNull();
 		assertThat(healthDetails).isNotEmpty();
+		assertThat(healthDetails).containsEntry("geode.cache.name", "MockGemFireCache");
 		assertThat(healthDetails).containsEntry("geode.cache.closed", "No");
 		assertThat(healthDetails).containsEntry("geode.cache.cancel-in-progress", "No");
 		assertThat(healthDetails).containsKey("geode.distributed-member.id");