diff --git a/src/assoc.h b/src/assoc.h
index 5ca118631c565610274510d2e25d13d4534f7fdf..e42bcd65368e9905f0e69904b0e362f98f865ac8 100644
--- a/src/assoc.h
+++ b/src/assoc.h
@@ -35,6 +35,8 @@ extern "C" {
 #define MH_UNDEF
 #endif
 
+#include "third_party/PMurHash.h"
+
 /*
  * Map: (i32) => (void *)
  */
@@ -53,6 +55,55 @@ struct mh_i32ptr_node_t {
 #define mh_cmp_key(a, b, arg) ((a) != (b->key))
 #include "salad/mhash.h"
 
+/*
+ * Map: (char * with length) => (void *)
+ */
+enum {
+	MH_STRN_HASH_SEED = 13U
+};
+
+static inline uint32_t
+mh_strn_hash(const char *str, size_t len)
+{
+	uint32_t h = MH_STRN_HASH_SEED;
+	uint32_t carry = 0;
+	PMurHash32_Process(&h, &carry, str, len);
+	return PMurHash32_Result(h, carry, len);
+}
+
+#define mh_name _strnptr
+struct mh_strnptr_key_t {
+	const char *str;
+	size_t len;
+	uint32_t hash;
+};
+#define mh_key_t struct mh_strnptr_key_t *
+
+struct mh_strnptr_node_t {
+	const char *str;
+	size_t len;
+	uint32_t hash;
+	void *val;
+};
+#define mh_node_t struct mh_strnptr_node_t
+
+#define mh_arg_t void *
+#define mh_hash(a, arg) ((a)->hash)
+#define mh_hash_key(a, arg) ((a)->hash)
+#define mh_cmp(a, b, arg) ((a)->len != (b)->len || \
+			    strncmp((a)->str, (b)->str, (a)->len))
+#define mh_cmp_key(a, b, arg) mh_cmp(a, b, arg)
+#include "salad/mhash.h"
+
+static inline mh_int_t
+mh_strnptr_find_inp(struct mh_strnptr_t *h, const char *str, size_t len)
+{
+	uint32_t hash = mh_strn_hash(str, len);
+	struct mh_strnptr_key_t key = {str, len, hash};
+	return mh_strnptr_find(h, &key, NULL);
+};
+
+
 #if defined(__cplusplus)
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
diff --git a/src/box/schema.cc b/src/box/schema.cc
index 0c8992b2808b1a2da7ccf29c8d5da1c9833fa6cc..5ba0659781703515b04c048e09e26d9d7b3b4a37 100644
--- a/src/box/schema.cc
+++ b/src/box/schema.cc
@@ -57,6 +57,7 @@
 /** All existing spaces. */
 static struct mh_i32ptr_t *spaces;
 static struct mh_i32ptr_t *funcs;
+static struct mh_strnptr_t *funcs_by_name;
 int sc_version;
 
 bool
@@ -233,6 +234,7 @@ schema_init()
 	/* Initialize the space cache. */
 	spaces = mh_i32ptr_new();
 	funcs = mh_i32ptr_new();
+	funcs_by_name = mh_strnptr_new();
 	/*
 	 * Create surrogate space objects for the mandatory system
 	 * spaces (the primal eggs from which we get all the
@@ -346,8 +348,19 @@ func_cache_replace(struct func_def *def)
 			       "dictionary cache (stored function).");
 	}
 	const struct mh_i32ptr_node_t node = { def->fid, func };
-	mh_int_t k = mh_i32ptr_put(funcs, &node, NULL, NULL);
-	if (k == mh_end(funcs)) {
+	mh_int_t k1 = mh_i32ptr_put(funcs, &node, NULL, NULL);
+	if (k1 == mh_end(funcs)) {
+		func_delete(func);
+		goto error;
+	}
+	size_t def_name_len = strlen(func->def.name);
+	uint32_t name_hash = mh_strn_hash(func->def.name, def_name_len);
+	const struct mh_strnptr_node_t strnode = {
+		func->def.name, def_name_len, name_hash, func };
+
+	mh_int_t k2 = mh_strnptr_put(funcs_by_name, &strnode, NULL, NULL);
+	if (k2 == mh_end(funcs_by_name)) {
+		mh_i32ptr_del(funcs, k1, NULL);
 		func_delete(func);
 		goto error;
 	}
@@ -362,6 +375,10 @@ func_cache_delete(uint32_t fid)
 	struct func *func = (struct func *)
 		mh_i32ptr_node(funcs, k)->val;
 	mh_i32ptr_del(funcs, k, NULL);
+	k = mh_strnptr_find_inp(funcs_by_name, func->def.name,
+				strlen(func->def.name));
+	if (k != mh_end(funcs))
+		mh_strnptr_del(funcs_by_name, k, NULL);
 	func_delete(func);
 }
 
@@ -374,6 +391,15 @@ func_by_id(uint32_t fid)
 	return (struct func *) mh_i32ptr_node(funcs, func)->val;
 }
 
+struct func *
+func_by_name(const char *name, uint32_t name_len)
+{
+	mh_int_t func = mh_strnptr_find_inp(funcs_by_name, name, name_len);
+	if (func == mh_end(funcs_by_name))
+		return NULL;
+	return (struct func *) mh_strnptr_node(funcs_by_name, func)->val;
+}
+
 bool
 schema_find_grants(const char *type, uint32_t id)
 {
diff --git a/src/box/schema.h b/src/box/schema.h
index 93d6076d036c2a4269e287eeefebe6d8ca5b22fb..170ad569c19c926e323eaa32495ed22ef939c5fa 100644
--- a/src/box/schema.h
+++ b/src/box/schema.h
@@ -139,12 +139,8 @@ func_cache_find(uint32_t fid)
 	return func;
 }
 
-static inline struct func *
-func_by_name(const char *name, uint32_t name_len)
-{
-	uint32_t fid = schema_find_id(SC_FUNC_ID, 2, name, name_len);
-	return func_by_id(fid);
-}
+struct func *
+func_by_name(const char *name, uint32_t name_len);
 
 
 /**