diff --git a/src/main/java/org/springframework/data/gemfire/function/annotation/OnServers.java b/src/main/java/org/springframework/data/gemfire/function/annotation/OnServers.java
index e3257965..0028931e 100644
--- a/src/main/java/org/springframework/data/gemfire/function/annotation/OnServers.java
+++ b/src/main/java/org/springframework/data/gemfire/function/annotation/OnServers.java
@@ -45,5 +45,5 @@ public @interface OnServers {
 	/**
 	 *  A reference to the cache
 	 */
-	String cache() default "gemfireCache";
+	String cache() default "";
 }
diff --git a/src/main/java/org/springframework/data/gemfire/function/config/ServerBasedExecutionBeanDefinitionBuilder.java b/src/main/java/org/springframework/data/gemfire/function/config/ServerBasedExecutionBeanDefinitionBuilder.java
index dee5ef1e..3c5576c6 100644
--- a/src/main/java/org/springframework/data/gemfire/function/config/ServerBasedExecutionBeanDefinitionBuilder.java
+++ b/src/main/java/org/springframework/data/gemfire/function/config/ServerBasedExecutionBeanDefinitionBuilder.java
@@ -32,37 +32,33 @@ abstract class ServerBasedExecutionBeanDefinitionBuilder extends AbstractFunctio
 		super(configuration);
 	}
 
-	 
- 
 	/* (non-Javadoc)
 	 * @see org.springframework.data.gemfire.function.config.AbstractFunctionExecutionBeanDefinitionBuilder#getGemfireOperationsBeanDefinitionBuilder(org.springframework.beans.factory.support.BeanDefinitionRegistry)
 	 */
 	@Override
 	protected BeanDefinitionBuilder getGemfireOperationsBeanDefinitionBuilder(BeanDefinitionRegistry registry) {
-		
-		BeanDefinitionBuilder functionTemplateBuilder = BeanDefinitionBuilder.genericBeanDefinition(getGemfireOperationsClass());
-		
-		String pool = (String)configuration.getAttribute("pool");
-		String cache = (String)configuration.getAttribute("cache");
-		
-		Assert.state(!(StringUtils.hasText(pool) && StringUtils.hasText(cache)),
-				String.format("invalid configuration for interface %s. Cannot specify both 'pool' and 'cache'",
-						configuration.getFunctionExecutionInterface().getName())); 
-		
+
+		BeanDefinitionBuilder functionTemplateBuilder = BeanDefinitionBuilder
+				.genericBeanDefinition(getGemfireOperationsClass());
+
+		String pool = (String) configuration.getAttribute("pool");
+		String cache = (String) configuration.getAttribute("cache");
+
+		Assert.state(!(StringUtils.hasText(pool) && StringUtils.hasText(cache)), String.format(
+				"invalid configuration for interface %s. Cannot specify both 'pool' and 'cache'", configuration
+						.getFunctionExecutionInterface().getName()));
+
 		if (StringUtils.hasText(pool)) {
-			
 			functionTemplateBuilder.addConstructorArgReference(pool);
 		} else {
 			if (!StringUtils.hasText(cache)) {
 				cache = GemfireConstants.DEFAULT_GEMFIRE_CACHE_NAME;
 			}
-			
 			functionTemplateBuilder.addConstructorArgReference(cache);
 		}
 		return functionTemplateBuilder;
 	}
 
-
 	/* (non-Javadoc)
 	 * @see org.springframework.data.gemfire.function.config.AbstractFunctionExecutionBeanDefinitionBuilder#getFunctionProxyFactoryBeanClass()
 	 */