diff --git a/casadm/cas_main.c b/casadm/cas_main.c
index 7726288..b901d4f 100644
--- a/casadm/cas_main.c
+++ b/casadm/cas_main.c
@@ -64,7 +64,7 @@ struct command_args{
 
 static struct command_args command_args_values = {
 		.force = 0,
-		.cache_id = 0,
+		.cache_id = OCF_CACHE_ID_INVALID,
 		.core_id = OCF_CORE_ID_INVALID,
 		.state = CACHE_INIT_NEW,
 		.cache_mode = ocf_cache_mode_default,
diff --git a/modules/cas_cache/layer_cache_management.c b/modules/cas_cache/layer_cache_management.c
index ece3f42..1c89558 100644
--- a/modules/cas_cache/layer_cache_management.c
+++ b/modules/cas_cache/layer_cache_management.c
@@ -167,7 +167,7 @@ static uint16_t find_free_cache_id(ocf_ctx_t ctx)
 		else if (result == -OCF_ERR_CACHE_NOT_EXIST)
 			break;
 		else
-			return OCF_CACHE_ID_MAX;
+			return OCF_CACHE_ID_INVALID;
 	}
 
 	return id;
@@ -1037,9 +1037,9 @@ int cache_mngt_prepare_cache_cfg(struct ocf_mngt_cache_config *cfg,
 	if (strnlen(cmd->cache_path_name, MAX_STR_LEN) >= MAX_STR_LEN)
 		return -OCF_ERR_INVAL;
 
-	if (cmd->cache_id == OCF_CACHE_ID_MAX) {
+	if (cmd->cache_id == OCF_CACHE_ID_INVALID) {
 		cache_id = find_free_cache_id(cas_ctx);
-		if (cache_id == OCF_CACHE_ID_MAX)
+		if (cache_id == OCF_CACHE_ID_INVALID)
 			return -OCF_ERR_INVAL;
 
 		cmd->cache_id = cache_id;
@@ -1051,7 +1051,7 @@ int cache_mngt_prepare_cache_cfg(struct ocf_mngt_cache_config *cfg,
 	memset(device_cfg, 0, sizeof(*device_cfg));
 	memset(atomic_params, 0, sizeof(*atomic_params));
 
-	cfg->name = cache_name;
+	strncpy(cfg->name, cache_name, OCF_CACHE_NAME_SIZE);
 	cfg->cache_mode = cmd->caching_mode;
 	cfg->cache_line_size = cmd->line_size;
 	cfg->eviction_policy = cmd->eviction_policy;
diff --git a/modules/cas_cache/layer_upgrade.c b/modules/cas_cache/layer_upgrade.c
index ec32992..93980aa 100644
--- a/modules/cas_cache/layer_upgrade.c
+++ b/modules/cas_cache/layer_upgrade.c
@@ -861,7 +861,7 @@ static int _cas_upgrade_restore_conf_main(struct cas_properties *cache_props,
 	if (cache_mode >= ocf_cache_mode_max)
 		cache_mode = ocf_cache_mode_default;
 
-	cfg.name = cache_name;
+	strncpy(cfg.name, cache_name, OCF_CACHE_NAME_SIZE);
 	cfg.cache_mode = cache_mode;
 	/* cfg.eviction_policy = TODO */
 	cfg.cache_line_size = cache_line_size;
diff --git a/ocf b/ocf
index 8ed525a..43e8905 160000
--- a/ocf
+++ b/ocf
@@ -1 +1 @@
-Subproject commit 8ed525ae7f9f2e8af12ff88804dd5a73d8c9fdd1
+Subproject commit 43e8905456aa0bd4fdf12c3e8aa374c641684471