diff --git a/libraries/src/Cache/Cache.php b/libraries/src/Cache/Cache.php
index f9888bdb12..5bfd67c5a6 100644
--- a/libraries/src/Cache/Cache.php
+++ b/libraries/src/Cache/Cache.php
@@ -59,6 +59,24 @@ class Cache
 			'caching'      => ($conf->get('caching') >= 1) ? true : false,
 		);
 
+		if ($conf->get('cache_platformprefix', '0'))
+		{
+			$webclient = new WebClient;
+
+			 // Add a platform key to cache key if device calls for separate caching
+			if ($webclient->mobile)
+			{
+				if ($webclient->platform === WebClient::ANDROIDTABLET)
+				{
+					$this->_options['platformKey'] = 'T';
+				}
+				else
+				{
+					$this->_options['platformKey'] = 'M';
+				}
+			}
+		}
+
 		// Overwrite default options with given options
 		foreach ($options as $option => $value)
 		{
@@ -758,6 +776,7 @@ class Cache
 	 * @return  string
 	 *
 	 * @since   3.5
+	 * @deprecated  4.0
 	 */
 	public static function getPlatformPrefix()
 	{
@@ -771,7 +790,7 @@ class Cache
 
 		if ($webclient->mobile)
 		{
-			return 'M-';
+			return $webclient->platform === WebClient::ANDROIDTABLET ? 'T-' : 'M-';
 		}
 
 		return '';
diff --git a/libraries/src/Cache/CacheStorage.php b/libraries/src/Cache/CacheStorage.php
index d704f71f23..8787de71df 100644
--- a/libraries/src/Cache/CacheStorage.php
+++ b/libraries/src/Cache/CacheStorage.php
@@ -77,6 +77,22 @@ class CacheStorage
 	 */
 	public $_hash;
 
+	/**
+	 * Platform key used as prefix or suffix
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $_platformKey;
+
+	/**
+	 * Whether platform key is used as suffix
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $_platformKeyAsSuffix = false;
+
 	/**
 	 * Constructor
 	 *
@@ -89,11 +105,12 @@ class CacheStorage
 		$config = \JFactory::getConfig();
 
 		$this->_hash        = md5($config->get('secret'));
-		$this->_application = (isset($options['application'])) ? $options['application'] : null;
-		$this->_language    = (isset($options['language'])) ? $options['language'] : 'en-GB';
-		$this->_locking     = (isset($options['locking'])) ? $options['locking'] : true;
-		$this->_lifetime    = (isset($options['lifetime'])) ? $options['lifetime'] * 60 : $config->get('cachetime') * 60;
-		$this->_now         = (isset($options['now'])) ? $options['now'] : time();
+		$this->_application = isset($options['application']) ? $options['application'] : null;
+		$this->_language    = isset($options['language']) ? $options['language'] : 'en-GB';
+		$this->_locking     = isset($options['locking']) ? $options['locking'] : true;
+		$this->_lifetime    = isset($options['lifetime']) ? $options['lifetime'] * 60 : $config->get('cachetime') * 60;
+		$this->_now         = isset($options['now']) ? $options['now'] : time();
+		$this->_platformKey = isset($options['platformKey']) ? $options['platformKey'] : '';
 
 		// Set time threshold value.  If the lifetime is not set, default to 60 (0 is BAD)
 		// _threshold is now available ONLY as a legacy (it's deprecated).  It's no longer used in the core.
@@ -374,7 +391,19 @@ class CacheStorage
 		$name          = md5($this->_application . '-' . $id . '-' . $this->_language);
 		$this->rawname = $this->_hash . '-' . $name;
 
-		return Cache::getPlatformPrefix() . $this->_hash . '-cache-' . $group . '-' . $name;
+		$cacheId = $this->_hash . '-cache-' . $group . '-' . $name;
+
+		if ($this->_platformKey !== '')
+		{
+			if ($this->_platformKeyAsSuffix)
+			{
+				return $cacheId . '-' . $this->_platformKey;
+			}
+
+			return $this->_platformKey . '-' . $cacheId;
+		}
+
+		return $cacheId;
 	}
 
 	/**
diff --git a/libraries/src/Cache/Storage/MemcacheStorage.php b/libraries/src/Cache/Storage/MemcacheStorage.php
index ebd3c59f10..eadd3abcee 100644
--- a/libraries/src/Cache/Storage/MemcacheStorage.php
+++ b/libraries/src/Cache/Storage/MemcacheStorage.php
@@ -38,6 +38,14 @@ class MemcacheStorage extends CacheStorage
 	 */
 	protected $_compress = 0;
 
+	/**
+	 * Whether platform key is used as suffix
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $_platformKeyAsSuffix = true;
+
 	/**
 	 * Constructor
 	 *
@@ -98,31 +106,6 @@ class MemcacheStorage extends CacheStorage
 		}
 	}
 
-	/**
-	 * Get a cache_id string from an id/group pair
-	 *
-	 * @param   string  $id     The cache data id
-	 * @param   string  $group  The cache data group
-	 *
-	 * @return  string   The cache_id string
-	 *
-	 * @since   11.1
-	 */
-	protected function _getCacheId($id, $group)
-	{
-		$prefix   = Cache::getPlatformPrefix();
-		$length   = strlen($prefix);
-		$cache_id = parent::_getCacheId($id, $group);
-
-		if ($length)
-		{
-			// Memcache use suffix instead of prefix
-			$cache_id = substr($cache_id, $length) . strrev($prefix);
-		}
-
-		return $cache_id;
-	}
-
 	/**
 	 * Check if the cache contains data stored by ID and group
 	 *
diff --git a/libraries/src/Cache/Storage/MemcachedStorage.php b/libraries/src/Cache/Storage/MemcachedStorage.php
index 2f16b79132..fa4b7cfb27 100644
--- a/libraries/src/Cache/Storage/MemcachedStorage.php
+++ b/libraries/src/Cache/Storage/MemcachedStorage.php
@@ -38,6 +38,14 @@ class MemcachedStorage extends CacheStorage
 	 */
 	protected $_compress = 0;
 
+	/**
+	 * Whether platform key is used as suffix
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $_platformKeyAsSuffix = true;
+
 	/**
 	 * Constructor
 	 *
diff --git a/libraries/src/Cache/Storage/RedisStorage.php b/libraries/src/Cache/Storage/RedisStorage.php
index a06578ca3d..40c4beee59 100644
--- a/libraries/src/Cache/Storage/RedisStorage.php
+++ b/libraries/src/Cache/Storage/RedisStorage.php
@@ -36,6 +36,14 @@ class RedisStorage extends CacheStorage
 	 */
 	protected $_persistent = false;
 
+	/**
+	 * Whether platform key is used as suffix
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $_platformKeyAsSuffix = true;
+
 	/**
 	 * Constructor
 	 *