diff --git a/administrator/components/com_config/model/form/application.xml b/administrator/components/com_config/model/form/application.xml
index a620e7993fa9b..bc0beb7b7040d 100644
--- a/administrator/components/com_config/model/form/application.xml
+++ b/administrator/components/com_config/model/form/application.xml
@@ -143,6 +143,17 @@
 			<option value="0">JNO</option>
 		</field>
 
+		<field
+			name="redis_server_cluster_host_port"
+			type="text"
+			label="COM_CONFIG_FIELD_REDISCLUSTER_HOST_LABEL"
+			description="COM_CONFIG_FIELD_REDISCLUSTER_HOST_DESC"
+			default="localhost:6379, localhost:6380"
+			filter="string"
+			showon="cache_handler:rediscluster"
+			size="100"
+		/>
+
 		<field
 			name="redis_server_host"
 			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 6ec7ef582e78d..be7269fb5f23e 100644
--- a/administrator/language/en-GB/en-GB.com_config.ini
+++ b/administrator/language/en-GB/en-GB.com_config.ini
@@ -156,6 +156,8 @@ COM_CONFIG_FIELD_REDIS_PERSISTENT_DESC="Persistent Redis."
 COM_CONFIG_FIELD_REDIS_PERSISTENT_LABEL="Persistent Redis"
 COM_CONFIG_FIELD_REDIS_PORT_DESC="Redis server port."
 COM_CONFIG_FIELD_REDIS_PORT_LABEL="Redis Server Port"
+COM_CONFIG_FIELD_REDISCLUSTER_HOST_DESC="Redis Cluster server:port, server2:port2."
+COM_CONFIG_FIELD_REDISCLUSTER_HOST_LABEL="Redis Cluster Servers & Ports"
 COM_CONFIG_FIELD_METAAUTHOR_DESC="Show the author meta tag when viewing articles."
 COM_CONFIG_FIELD_METAAUTHOR_LABEL="Show Author Meta Tag"
 COM_CONFIG_FIELD_METADESC_DESC="Enter a description of the overall website that may be used by search engines. Generally, a maximum of 20 words is optimal."
diff --git a/administrator/language/en-GB/en-GB.lib_joomla.ini b/administrator/language/en-GB/en-GB.lib_joomla.ini
index 5aa2d69e3ff5c..0770307945812 100644
--- a/administrator/language/en-GB/en-GB.lib_joomla.ini
+++ b/administrator/language/en-GB/en-GB.lib_joomla.ini
@@ -334,6 +334,7 @@ JLIB_FORM_VALUE_CACHE_FILE="File"
 JLIB_FORM_VALUE_CACHE_MEMCACHE="Memcache"
 JLIB_FORM_VALUE_CACHE_MEMCACHED="Memcached (Experimental)"
 JLIB_FORM_VALUE_CACHE_REDIS="Redis"
+JLIB_FORM_VALUE_CACHE_REDISCLUSTER="Redis Cluster"
 JLIB_FORM_VALUE_CACHE_WINCACHE="Windows Cache"
 JLIB_FORM_VALUE_CACHE_XCACHE="XCache"
 JLIB_FORM_VALUE_SESSION_APC="Alternative PHP Cache"
diff --git a/language/en-GB/en-GB.lib_joomla.ini b/language/en-GB/en-GB.lib_joomla.ini
index 5aa2d69e3ff5c..0770307945812 100644
--- a/language/en-GB/en-GB.lib_joomla.ini
+++ b/language/en-GB/en-GB.lib_joomla.ini
@@ -334,6 +334,7 @@ JLIB_FORM_VALUE_CACHE_FILE="File"
 JLIB_FORM_VALUE_CACHE_MEMCACHE="Memcache"
 JLIB_FORM_VALUE_CACHE_MEMCACHED="Memcached (Experimental)"
 JLIB_FORM_VALUE_CACHE_REDIS="Redis"
+JLIB_FORM_VALUE_CACHE_REDISCLUSTER="Redis Cluster"
 JLIB_FORM_VALUE_CACHE_WINCACHE="Windows Cache"
 JLIB_FORM_VALUE_CACHE_XCACHE="XCache"
 JLIB_FORM_VALUE_SESSION_APC="Alternative PHP Cache"
diff --git a/libraries/joomla/cache/storage/redis.php b/libraries/joomla/cache/storage/redis.php
index b1913d72d20e2..4406c4c264a9f 100644
--- a/libraries/joomla/cache/storage/redis.php
+++ b/libraries/joomla/cache/storage/redis.php
@@ -284,7 +284,7 @@ public function remove($id, $group)
 			return false;
 		}
 
-		return (bool) static::$_redis->delete($this->_getCacheId($id, $group));
+		return static::$_redis->del($this->_getCacheId($id, $group))>0;
 	}
 
 	/**
@@ -320,12 +320,12 @@ public function clean($group, $mode = null)
 		{
 			if (strpos($key, $secret . '-cache-' . $group . '-') === 0 && $mode == 'group')
 			{
-				static::$_redis->delete($key);
+				static::$_redis->del($key);
 			}
 
 			if (strpos($key, $secret . '-cache-' . $group . '-') !== 0 && $mode != 'group')
 			{
-				static::$_redis->delete($key);
+				static::$_redis->del($key);
 			}
 		}
 
diff --git a/libraries/joomla/cache/storage/rediscluster.php b/libraries/joomla/cache/storage/rediscluster.php
new file mode 100644
index 0000000000000..a086b78d9c099
--- /dev/null
+++ b/libraries/joomla/cache/storage/rediscluster.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Cache
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+defined('JPATH_PLATFORM') or die;
+/**
+ * Redis Cluster cache storage handler for PECL
+ *
+ * @since  3.4
+ */
+class JCacheStorageRediscluster extends JCacheStorageRedis
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters.
+	 *
+	 * @since   3.4
+	 */
+	public function __construct($options = array())
+	{
+		JCacheStorage::__construct($options);
+		if (static::$_redis === null)
+		{
+			$this->getConnection();
+		}
+	}
+	/**
+	 * Create the Redis Cluster connection
+	 *
+	 * @return  Redis|boolean  Redis connection object on success, boolean on failure
+	 *
+	 * @since   3.4
+	 * @note    As of 4.0 this method will throw a JCacheExceptionConnecting object on connection failure
+	 */
+	protected function getConnection()
+	{
+		if (static::isSupported() == false)
+		{
+			return false;
+		}
+		$app = JFactory::getApplication();
+
+		$string = $app->get('redis_server_cluster_host_port');
+		$string = str_replace(' ', '', $string);
+		$arr = explode(",",$string);
+		if (empty($arr)) {
+			return false;
+		}
+
+		static::$_redis = new RedisCluster(NULL, $arr);
+
+		// The default option, only send commands to master nodes
+		static::$_redis->setOption(RedisCluster::OPT_SLAVE_FAILOVER, RedisCluster::FAILOVER_NONE);
+
+		// In the event we can't reach a master, and it has slaves, failover for read commands
+		static::$_redis->setOption(RedisCluster::OPT_SLAVE_FAILOVER, RedisCluster::FAILOVER_ERROR);
+
+		// Always distribute readonly commands between masters and slaves, at random
+		static::$_redis->setOption(RedisCluster::OPT_SLAVE_FAILOVER, RedisCluster::FAILOVER_DISTRIBUTE);
+
+		try
+		{
+			static::$_redis->ping();
+		}
+		catch (RedisClusterException $e)
+		{
+			static::$_redis = null;
+			if ($app->isClient('administrator'))
+			{
+				JError::raiseWarning(500, 'Redis Cluster ping failed');
+			}
+			return false;
+		}
+		return static::$_redis;
+	}
+	/**
+	 * Test to see if the storage handler is available.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.4
+	 */
+	public static function isSupported()
+	{
+		return class_exists('RedisCluster');
+	}
+	/**
+	 * Test to see if the Redis Cluster connection is available.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.4
+	 */
+	public static function isConnected()
+	{
+		return static::$_redis instanceof RedisCluster;
+	}
+}
\ No newline at end of file
diff --git a/tests/unit/suites/libraries/joomla/cache/storage/JCacheStorageRedisclusterTest.php b/tests/unit/suites/libraries/joomla/cache/storage/JCacheStorageRedisclusterTest.php
new file mode 100644
index 0000000000000..f898399c140e9
--- /dev/null
+++ b/tests/unit/suites/libraries/joomla/cache/storage/JCacheStorageRedisclusterTest.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Cache
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+/**
+ * Test class for JCacheStorageRediscluster.
+ */
+class JCacheStorageRedisclusterTest extends TestCaseCache
+{
+	/**
+	 * Sets up the fixture, for example, opens a network connection.
+	 * This method is called before a test is executed.
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		if (!JCacheStorageRediscluster::isSupported())
+		{
+			$this->markTestSkipped('The Redis Cluster cache handler is not supported on this system.');
+		}
+		parent::setUp();
+		// Mock the returns on JApplicationCms::get() to use the default values
+		JFactory::$application->expects($this->any())
+			->method('get')
+			->willReturnArgument(1);
+		$this->handler = new JCacheStorageRediscluster;
+		// This adapter doesn't throw an Exception on a connection failure so we'll have to use Reflection to get into the class to check it
+		if (!(TestReflection::getValue($this->handler, '_rediscluster') instanceof RedisCluster))
+		{
+			$this->markTestSkipped('Failed to connect to Redis Cluster');
+		}
+		// Override the lifetime because the JCacheStorage API multiplies it by 60 (converts minutes to seconds)
+		$this->handler->_lifetime = 2;
+	}
+}
\ No newline at end of file