diff --git a/classes/module/Module.php b/classes/module/Module.php
index 3037a56a8..e42b12fdb 100644
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -1595,7 +1595,7 @@ abstract class ModuleCore
 	{
 		if ($name === null)
 			$name = $this->name;
-		return $name.'|'.(int)$this->context->shop->id.'_'.(int)Group::getCurrent()->id.'_'.(int)$this->context->language->id;
+		return $name.'|'.(int)$this->context->shop->id.'|'.(int)Group::getCurrent()->id.'|'.(int)$this->context->language->id;
 	}
 
 	public function display($file, $template, $cacheId = null, $compileId = null)
diff --git a/modules/blockcategories/blockcategories.php b/modules/blockcategories/blockcategories.php
index 60df5c858..767ad74f0 100644
--- a/modules/blockcategories/blockcategories.php
+++ b/modules/blockcategories/blockcategories.php
@@ -227,7 +227,7 @@ class BlockCategories extends Module
 		$id_product = (int)Tools::getValue('id_product', 0);
 		$id_category = (int)Tools::getValue('id_category', 0);
 		$id_lang = (int)$this->context->language->id;
-		return 'blockcategories|'.$this->context->shop->id.'_'.$groups.'_'.$id_lang.'_'.$id_product.'_'.$id_category;
+		return 'blockcategories|'.$this->context->shop->id.'|'.$groups.'|'.$id_lang.'|'.$id_product.'|'.$id_category;
 	}
 
 	public function hookFooter($params)
diff --git a/modules/blocksearch/blocksearch.php b/modules/blocksearch/blocksearch.php
index 496c93753..1df62a660 100644
--- a/modules/blocksearch/blocksearch.php
+++ b/modules/blocksearch/blocksearch.php
@@ -121,7 +121,7 @@ public function hookDisplayMobileHeader($params)
 	protected function getCacheId($name = null)
 	{
 		$cache_id = parent::getCacheId($name);
-		return $cache_id.'_'.(int)Tools::usingSecureMode();
+		return $cache_id.'|'.(int)Tools::usingSecureMode();
 	}
 }
 
diff --git a/modules/blocktopmenu/blocktopmenu.php b/modules/blocktopmenu/blocktopmenu.php
index eff8627f3..25f34e570 100644
--- a/modules/blocktopmenu/blocktopmenu.php
+++ b/modules/blocktopmenu/blocktopmenu.php
@@ -717,7 +717,7 @@ class Blocktopmenu extends Module
 	{
 		parent::getCacheId($name);
 		$page_name = in_array($this->page_name, array('category', 'supplier', 'manufacturer', 'cms', 'product')) ? $this->page_name : 'index';
-		return 'blocktopmenu|'.$page_name.'-'.(int)$this->context->shop->id.'-'.implode(', ',$this->user_groups).'-'.(int)$this->context->language->id.'-'.(int)Tools::getValue('id_category').'-'.(int)Tools::getValue('id_manufacturer').'-'.(int)Tools::getValue('id_supplier').'-'.(int)Tools::getValue('id_cms').'-'.(int)Tools::getValue('id_product');
+		return 'blocktopmenu|'.$page_name.'|'.(int)$this->context->shop->id.'|'.implode(', ',$this->user_groups).'|'.(int)$this->context->language->id.'|'.(int)Tools::getValue('id_category').'|'.(int)Tools::getValue('id_manufacturer').'|'.(int)Tools::getValue('id_supplier').'|'.(int)Tools::getValue('id_cms').'|'.(int)Tools::getValue('id_product');
 	}
 
 	public function hookDisplayTop($param)