diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/service/FallbackBaseServiceInfoCreator.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/FallbackBaseServiceInfoCreator.java
new file mode 100644
index 0000000..23a815a
--- /dev/null
+++ b/spring-cloud-core/src/main/java/org/springframework/cloud/service/FallbackBaseServiceInfoCreator.java
@@ -0,0 +1,11 @@
+package org.springframework.cloud.service;
+
+import org.springframework.cloud.FallbackServiceInfoCreator;
+import org.springframework.cloud.AbstractCloudConnector.KeyValuePair;
+
+public class FallbackBaseServiceInfoCreator extends FallbackServiceInfoCreator<BaseServiceInfo, KeyValuePair> {
+    @Override
+    public BaseServiceInfo createServiceInfo(KeyValuePair serviceData) {
+        return new BaseServiceInfo(serviceData.getKey());
+    }
+}
diff --git a/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/HerokuConnector.java b/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/HerokuConnector.java
index ac39931..ab91ba0 100644
--- a/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/HerokuConnector.java
+++ b/spring-cloud-heroku-connector/src/main/java/org/springframework/cloud/heroku/HerokuConnector.java
@@ -12,6 +12,7 @@ import org.springframework.cloud.FallbackServiceInfoCreator;
 import org.springframework.cloud.ServiceInfoCreator;
 import org.springframework.cloud.app.ApplicationInstanceInfo;
 import org.springframework.cloud.service.BaseServiceInfo;
+import org.springframework.cloud.service.FallbackBaseServiceInfoCreator;
 import org.springframework.cloud.service.ServiceInfo;
 import org.springframework.cloud.util.EnvironmentAccessor;
 
@@ -95,13 +96,6 @@ public class HerokuConnector extends AbstractCloudConnector<KeyValuePair> {
 
 	@Override
 	protected FallbackServiceInfoCreator<BaseServiceInfo,KeyValuePair> getFallbackServiceInfoCreator() {
-		return new HerokuFallbackServiceInfoCreator();
+		return new FallbackBaseServiceInfoCreator();
 	}
-}
-
-class HerokuFallbackServiceInfoCreator extends FallbackServiceInfoCreator<BaseServiceInfo,KeyValuePair> {
-	@Override
-	public BaseServiceInfo createServiceInfo(KeyValuePair serviceData) {
-		return new BaseServiceInfo(serviceData.getKey());
-	}
-}
+}
\ No newline at end of file