diff --git a/administrator/components/com_config/model/form/application.xml b/administrator/components/com_config/model/form/application.xml
index 36ab8d8a4e7fe..00cab17b67afd 100644
--- a/administrator/components/com_config/model/form/application.xml
+++ b/administrator/components/com_config/model/form/application.xml
@@ -24,6 +24,19 @@
 			filter="word">
 		</field>
 
+		<field
+			name="cache_platformprefix"
+			type="radio"
+			class="btn-group btn-group-yesno"
+			default="0"
+			label="COM_CONFIG_FIELD_CACHE_PLATFORMPREFIX_LABEL"
+			description="COM_CONFIG_FIELD_CACHE_PLATFORMPREFIX_DESC"
+			filter="integer"
+			showon="caching:1,2">
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
 		<field
 			name="cachetime"
 			type="text"
diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini
index 6fb24710ee723..234e43971f1ec 100644
--- a/administrator/language/en-GB/en-GB.com_config.ini
+++ b/administrator/language/en-GB/en-GB.com_config.ini
@@ -32,6 +32,8 @@ COM_CONFIG_ERROR_REMOVING_SUPER_ADMIN="You can't remove your own Super User perm
 COM_CONFIG_ERROR_WRITE_FAILED="Could not write to the configuration file"
 COM_CONFIG_FIELD_CACHE_HANDLER_DESC="Choose cache handler to enable caching. Native caching mechanism is file-based. Please make sure the cache folders are writable."
 COM_CONFIG_FIELD_CACHE_HANDLER_LABEL="Cache Handler"
+COM_CONFIG_FIELD_CACHE_PLATFORMPREFIX_LABEL="Platform specific caching"
+COM_CONFIG_FIELD_CACHE_PLATFORMPREFIX_DESC="Enable or disable platform specific caching. Enable when HTML output on mobile differs from other devices. (Default disabled.)"
 COM_CONFIG_FIELD_CACHE_LABEL="Cache"
 COM_CONFIG_FIELD_CACHE_DESC="Enable or disable caching and set caching level. Conservative level: smaller system cache, Progressive level (default): faster, bigger system cache, includes module renderers cache. Not appropriate for extremely large sites."
 COM_CONFIG_FIELD_CACHE_TIME_DESC="The maximum length of time in minutes for a cache file to be stored before it is refreshed."
diff --git a/installation/configuration.php-dist b/installation/configuration.php-dist
index d6510ff549af0..c3c8c48a04889 100644
--- a/installation/configuration.php-dist
+++ b/installation/configuration.php-dist
@@ -73,6 +73,7 @@ class JConfig {
 	public $caching = '0';
 	public $cachetime = '15';
 	public $cache_handler = 'file';
+	public $cache_platformprefix = '0';
 
 	/* Debug Settings */
 	public $debug = '0';
diff --git a/installation/model/configuration.php b/installation/model/configuration.php
index 840959c66edac..225951330cf70 100644
--- a/installation/model/configuration.php
+++ b/installation/model/configuration.php
@@ -117,6 +117,7 @@ public function _createConfiguration($options)
 		$registry->set('caching', 0);
 		$registry->set('cache_handler', 'file');
 		$registry->set('cachetime', 15);
+		$registry->set('cache_platformprefix', 0);
 
 		// Meta settings.
 		$registry->set('MetaDesc', $options->site_metadesc);
diff --git a/libraries/joomla/cache/cache.php b/libraries/joomla/cache/cache.php
index 2fb22c99714e8..52e8b24f06388 100644
--- a/libraries/joomla/cache/cache.php
+++ b/libraries/joomla/cache/cache.php
@@ -751,6 +751,33 @@ public static function makeId()
 		return md5(serialize($safeuriaddon));
 	}
 
+	/*** Set prefix cache key if device calls for separate caching
+	 *
+	 * @return  string   Platform specific prefix
+	 *
+	 * @since 3.5
+	 */
+	public static function getPlatformPrefix()
+	{
+		$conf = JFactory::getConfig();
+
+		// No prefix when Global Config is set to no platfom specific prefix
+		if (!$conf->get('cache_platformprefix', '0'))
+		{
+			return '';
+		}
+
+		jimport('joomla.application.web.client');
+		$webclient = new JApplicationWebClient();
+
+		if ($webclient->mobile)
+		{
+			return 'M-';
+		}
+
+		return '';
+	}
+
 	/**
 	 * Add a directory where JCache should search for handlers. You may
 	 * either pass a string or an array of directories.
diff --git a/libraries/joomla/cache/storage.php b/libraries/joomla/cache/storage.php
index d22f5d9bee76a..028a19479a992 100644
--- a/libraries/joomla/cache/storage.php
+++ b/libraries/joomla/cache/storage.php
@@ -312,10 +312,11 @@ public function unlock($id, $group = null)
 	 */
 	protected function _getCacheId($id, $group)
 	{
+		$prefix = JCache::getPlatformPrefix();
 		$name = md5($this->_application . '-' . $id . '-' . $this->_language);
 		$this->rawname = $this->_hash . '-' . $name;
 
-		return $this->_hash . '-cache-' . $group . '-' . $name;
+		return $prefix . $this->_hash . '-cache-' . $group . '-' . $name;
 	}
 
 	/**