diff --git a/pom.xml b/pom.xml
index dab6c5e6a..60de17945 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 		<java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
-		<spring-cloud-task.version>2.1.0.RELEASE</spring-cloud-task.version>
+		<spring-cloud-task.version>2.1.1.RELEASE</spring-cloud-task.version>
 		<wrapper.version>1.0.21.RELEASE</wrapper.version>
 		<docs.main>spring-cloud-function</docs.main>
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/AbstractComposableFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/AbstractComposableFunctionRegistry.java
index 6b0059ecc..8058afb98 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/AbstractComposableFunctionRegistry.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/AbstractComposableFunctionRegistry.java
@@ -118,7 +118,7 @@ public abstract class AbstractComposableFunctionRegistry implements FunctionRegi
 	 * @return immutable {@link Set} of available {@link Supplier} names.
 	 */
 	public Set<String> getSupplierNames() {
-		return Collections.unmodifiableSet(this.suppliers.keySet());
+		return this.suppliers.keySet();
 	}
 
 	/**
@@ -150,7 +150,9 @@ public abstract class AbstractComposableFunctionRegistry implements FunctionRegi
 	}
 
 	/**
-	 * The count of all Suppliers, Function and Consumers currently registered.
+	 * The size of this catalog, which is the count of all Suppliers,
+	 * Function and Consumers currently registered.
+	 *
 	 * @return the count of all Suppliers, Function and Consumers currently registered.
 	 */
 	@Override
@@ -184,7 +186,14 @@ public abstract class AbstractComposableFunctionRegistry implements FunctionRegi
 		this.environment = environment;
 	}
 
-	protected void wrap(FunctionRegistration<?> registration, String key) {
+	/**
+	 * Registers function wrapped by the provided FunctionRegistration with
+	 * this FunctionRegistry.
+	 *
+	 * @param registration instance of {@link FunctionRegistration}
+	 * @param key the name of the function
+	 */
+	protected void register(FunctionRegistration<?> registration, String key) {
 		Object target = registration.getTarget();
 		this.addName(target, key);
 		if (registration.getType() != null) {
diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
index 203a744fd..78eec7d8a 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogAutoConfiguration.java
@@ -110,7 +110,7 @@ public class ContextFunctionCatalogAutoConfiguration {
 		public <T> void register(FunctionRegistration<T> functionRegistration) {
 			Assert.notEmpty(functionRegistration.getNames(),
 					"'registration' must contain at least one name before it is registered in catalog.");
-			wrap(functionRegistration, functionRegistration.getNames().iterator().next());
+			register(functionRegistration, functionRegistration.getNames().iterator().next());
 		}
 
 		/**
@@ -256,7 +256,7 @@ public class ContextFunctionCatalogAutoConfiguration {
 						}
 					});
 
-			registrations.forEach(registration -> wrap(registration,
+			registrations.forEach(registration -> register(registration,
 					targets.get(registration.getTarget())));
 		}