diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Cache/ConfigTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Cache/ConfigTest.php
new file mode 100644
index 0000000000000..2d4a1dc0c2ce3
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Cache/ConfigTest.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento\Test\Integrity\Magento\Framework\Cache;
+
+use Magento\Framework\Config\Dom\UrnResolver;
+use Magento\Framework\TestFramework\Unit\Utility\XsdValidator;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Unit test of the cache configuration
+ */
+class ConfigTest extends TestCase
+{
+    /**
+     * Path to xsd schema file
+     * @var string
+     */
+    private $xsdSchema;
+
+    /**
+     * @var UrnResolver
+     */
+    private $urnResolver;
+
+    /**
+     * @var XsdValidator
+     */
+    private $xsdValidator;
+
+    /**
+     * Setup environment for test
+     */
+    protected function setUp(): void
+    {
+        if (!function_exists('libxml_set_external_entity_loader')) {
+            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
+        }
+        $this->urnResolver = new UrnResolver();
+        $this->xsdSchema = $this->urnResolver->getRealPath(
+            'urn:magento:framework:Cache/etc/cache.xsd'
+        );
+        $this->xsdValidator = new XsdValidator();
+    }
+
+    /**
+     * Tests invalid configurations
+     *
+     * @param string $xmlString
+     * @param array $expectedError
+     * @dataProvider schemaCorrectlyIdentifiesInvalidXmlDataProvider
+     */
+    public function testSchemaCorrectlyIdentifiesInvalidXml(
+        string $xmlString,
+        array $expectedError
+    ): void {
+        $actualError = $this->xsdValidator->validate(
+            $this->xsdSchema,
+            $xmlString
+        );
+        $this->assertEquals($expectedError, $actualError);
+    }
+
+    /**
+     * Tests valid configurations
+     */
+    public function testSchemaCorrectlyIdentifiesValidXml(): void
+    {
+        $xmlString = file_get_contents(__DIR__ . '/_files/valid_cache_config.xml');
+        $actualResult = $this->xsdValidator->validate(
+            $this->xsdSchema,
+            $xmlString
+        );
+
+        $this->assertEmpty($actualResult);
+    }
+
+    /**
+     * Data provider with invalid xml array according to cache.xsd
+     */
+    public function schemaCorrectlyIdentifiesInvalidXmlDataProvider(): array
+    {
+        return include __DIR__ . '/_files/invalidCacheConfigXmlArray.php';
+    }
+}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Cache/_files/invalidCacheConfigXmlArray.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Cache/_files/invalidCacheConfigXmlArray.php
new file mode 100644
index 0000000000000..8d2d631334a9b
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Cache/_files/invalidCacheConfigXmlArray.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    'without_type_handle' => [
+        '<?xml version="1.0"?><config></config>',
+        ["Element 'config': Missing child element(s). Expected is ( type ).\nLine: 1\n"],
+    ],
+    'cache_config_with_notallowed_attribute' => [
+        '<?xml version="1.0"?><config>' .
+        '<type name="test" translate="label,description" instance="Class\Name" notallowed="some value">' .
+        '<label>Test</label><description>Test</description></type></config>',
+        ["Element 'type', attribute 'notallowed': The attribute 'notallowed' is not allowed.\nLine: 1\n"],
+    ],
+    'cache_config_without_name_attribute' => [
+        '<?xml version="1.0"?><config><type translate="label,description" instance="Class\Name">' .
+        '<label>Test</label><description>Test</description></type></config>',
+        ["Element 'type': The attribute 'name' is required but missing.\nLine: 1\n"],
+    ],
+    'cache_config_without_instance_attribute' => [
+        '<?xml version="1.0"?><config><type name="test" translate="label,description">' .
+        '<label>Test</label><description>Test</description></type></config>',
+        ["Element 'type': The attribute 'instance' is required but missing.\nLine: 1\n"],
+    ],
+    'cache_config_without_label_element' => [
+        '<?xml version="1.0"?><config><type name="test" translate="label,description" instance="Class\Name">' .
+        '<description>Test</description></type></config>',
+        ["Element 'type': Missing child element(s). Expected is ( label ).\nLine: 1\n"],
+    ],
+    'cache_config_without_description_element' => [
+        '<?xml version="1.0"?><config><type name="test" translate="label,description" instance="Class\Name">' .
+        '<label>Test</label></type></config>',
+        ["Element 'type': Missing child element(s). Expected is ( description ).\nLine: 1\n"],
+    ],
+    'cache_config_without_child_elements' => [
+        '<?xml version="1.0"?><config><type name="test" translate="label,description" instance="Class\Name">' .
+        '</type></config>',
+        ["Element 'type': Missing child element(s). Expected is one of ( label, description ).\nLine: 1\n"],
+    ],
+    'cache_config_cache_name_not_unique' => [
+        '<?xml version="1.0"?><config><type name="test" translate="label,description" instance="Class\Name1">' .
+        '<label>Test1</label><description>Test1</description></type>' .
+        '<type name="test" translate="label,description" instance="Class\Name2">' .
+        '<label>Test2</label><description>Test2</description></type></config>',
+        [
+            "Element 'type': Duplicate key-sequence ['test'] in unique identity-constraint"
+                . " 'uniqueCacheName'.\nLine: 1\n"
+        ],
+    ],
+];
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Cache/_files/valid_cache_config.xml b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Cache/_files/valid_cache_config.xml
new file mode 100644
index 0000000000000..ef45c083daf0d
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Cache/_files/valid_cache_config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Cache/etc/cache.xsd">
+    <type name="type_name_1" translate="label,description" instance="Instance1\Class\Name">
+        <label>Type1</label>
+        <description>Type1</description>
+    </type>
+    <type name="type_name_2" translate="label,description" instance="Instance2\Class\Name">
+        <label>Type2</label>
+        <description>Type2</description>
+    </type>
+</config>
diff --git a/lib/internal/Magento/Framework/App/Cache/TypeList.php b/lib/internal/Magento/Framework/App/Cache/TypeList.php
index b695ee3a37fa8..c0790c4d40ad4 100644
--- a/lib/internal/Magento/Framework/App/Cache/TypeList.php
+++ b/lib/internal/Magento/Framework/App/Cache/TypeList.php
@@ -8,6 +8,9 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\SerializerInterface;
 
+/**
+ * Application cache type list
+ */
 class TypeList implements TypeListInterface
 {
     const INVALIDATED_TYPES = 'core_cache_invalidate';
@@ -68,9 +71,7 @@ public function __construct(
     protected function _getTypeInstance($type)
     {
         $config = $this->_config->getType($type);
-        if (!isset($config['instance'])) {
-            return null;
-        }
+
         return $this->_factory->get($config['instance']);
     }
 
@@ -132,7 +133,7 @@ public function getTypes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getTypeLabels()
     {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/TypeListTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/TypeListTest.php
index 8d9b297d7dded..02c9a872fe97f 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/TypeListTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/TypeListTest.php
@@ -6,21 +6,30 @@
 
 namespace Magento\Framework\App\Test\Unit\Cache;
 
-use \Magento\Framework\App\Cache\TypeList;
+use Magento\Framework\App\Cache\InstanceFactory;
+use Magento\Framework\App\Cache\StateInterface;
+use Magento\Framework\App\Cache\TypeList;
+use Magento\Framework\App\CacheInterface;
+use Magento\Framework\Cache\Frontend\Decorator\TagScope;
+use Magento\Framework\Cache\ConfigInterface;
+use Magento\Framework\DataObject;
 use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Test class for \Magento\Framework\App\Cache\TypeList
  */
-class TypeListTest extends \PHPUnit\Framework\TestCase
+class TypeListTest extends TestCase
 {
     /**
-     * @var \Magento\Framework\App\Cache\TypeList
+     * @var TypeList
      */
     protected $_typeList;
 
     /**
-     * @var \Magento\Framework\App\CacheInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CacheInterface|MockObject
      */
     protected $_cache;
 
@@ -30,7 +39,7 @@ class TypeListTest extends \PHPUnit\Framework\TestCase
     protected $_typesArray;
 
     /**
-     * @var \Magento\Framework\Cache\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ConfigInterface|MockObject
      */
     protected $_config;
 
@@ -47,10 +56,10 @@ class TypeListTest extends \PHPUnit\Framework\TestCase
     /**
      * Expected cache type
      */
-    const CACHE_TYPE = \Magento\Framework\Cache\FrontendInterface::class;
+    const CACHE_TYPE = TagScope::class;
 
     /**
-     * @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var SerializerInterface|MockObject
      */
     private $serializerMock;
 
@@ -58,33 +67,44 @@ protected function setUp()
     {
         $this->_typesArray = [
             self::TYPE_KEY => [
+                'name' => self::TYPE_KEY,
+                'instance' => self::CACHE_TYPE,
                 'label' => 'Type Label',
                 'description' => 'Type Description',
             ],
         ];
-        $this->_config =
-            $this->createPartialMock(\Magento\Framework\Cache\ConfigInterface::class, ['getTypes', 'getType']);
-        $this->_config->expects($this->any())->method('getTypes')->will($this->returnValue($this->_typesArray));
+        $this->_config = $this->createPartialMock(
+            ConfigInterface::class,
+            ['getTypes', 'getType']
+        );
+        $this->_config->expects($this->any())->method('getTypes')
+            ->will($this->returnValue($this->_typesArray));
+        $this->_config->expects($this->any())->method('getType')
+            ->with(self::TYPE_KEY)
+            ->will($this->returnValue($this->_typesArray[self::TYPE_KEY]));
 
         $cacheState = $this->createPartialMock(
-            \Magento\Framework\App\Cache\StateInterface::class,
+            StateInterface::class,
             ['isEnabled', 'setEnabled', 'persist']
         );
-        $cacheState->expects($this->any())->method('isEnabled')->will($this->returnValue(self::IS_CACHE_ENABLED));
-        $cacheBlockMock = $this->createMock(self::CACHE_TYPE);
-        $factory = $this->createPartialMock(\Magento\Framework\App\Cache\InstanceFactory::class, ['get']);
-        $factory->expects($this->any())->method('get')->with(self::CACHE_TYPE)->will(
-            $this->returnValue($cacheBlockMock)
-        );
+        $cacheState->expects($this->any())->method('isEnabled')
+            ->will($this->returnValue(self::IS_CACHE_ENABLED));
+        $cacheTypeMock = $this->createMock(self::CACHE_TYPE);
+        $cacheTypeMock->expects($this->any())->method('getTag')
+            ->will($this->returnValue('TEST'));
+        $factory = $this->createPartialMock(InstanceFactory::class, ['get']);
+        $factory->expects($this->any())->method('get')
+            ->with(self::CACHE_TYPE)
+            ->will($this->returnValue($cacheTypeMock));
         $this->_cache = $this->createPartialMock(
-            \Magento\Framework\App\CacheInterface::class,
+            CacheInterface::class,
             ['load', 'getFrontend', 'save', 'remove', 'clean']
         );
         $this->serializerMock = $this->createMock(SerializerInterface::class);
 
-        $objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $objectHelper = new ObjectManager($this);
         $this->_typeList = $objectHelper->getObject(
-            \Magento\Framework\App\Cache\TypeList::class,
+            TypeList::class,
             [
                 'config' => $this->_config,
                 'cacheState' => $cacheState,
@@ -114,9 +134,9 @@ public function testGetTypeLabels()
     public function testGetInvalidated()
     {
         $expectation = [self::TYPE_KEY => $this->_getPreparedType()];
-        $this->_cache->expects($this->once())->method('load')->with(TypeList::INVALIDATED_TYPES)->will(
-            $this->returnValue('serializedData')
-        );
+        $this->_cache->expects($this->once())->method('load')
+            ->with(TypeList::INVALIDATED_TYPES)
+            ->will($this->returnValue('serializedData'));
         $this->serializerMock->expects($this->once())
             ->method('unserialize')
             ->with('serializedData')
@@ -127,9 +147,9 @@ public function testGetInvalidated()
     public function testInvalidate()
     {
         // there are no invalidated types
-        $this->_cache->expects($this->once())->method('load')->with(TypeList::INVALIDATED_TYPES)->will(
-            $this->returnValue([])
-        );
+        $this->_cache->expects($this->once())->method('load')
+            ->with(TypeList::INVALIDATED_TYPES)
+            ->will($this->returnValue([]));
         $expectedInvalidated = [
             self::TYPE_KEY => 1,
         ];
@@ -137,18 +157,16 @@ public function testInvalidate()
             ->method('serialize')
             ->with($expectedInvalidated)
             ->willReturn('serializedData');
-        $this->_cache->expects($this->once())->method('save')->with(
-            'serializedData',
-            TypeList::INVALIDATED_TYPES
-        );
+        $this->_cache->expects($this->once())->method('save')
+            ->with('serializedData', TypeList::INVALIDATED_TYPES);
         $this->_typeList->invalidate(self::TYPE_KEY);
     }
 
     public function testInvalidateList()
     {
-        $this->_cache->expects($this->once())->method('load')->with(TypeList::INVALIDATED_TYPES)->will(
-            $this->returnValue([])
-        );
+        $this->_cache->expects($this->once())->method('load')
+            ->with(TypeList::INVALIDATED_TYPES)
+            ->will($this->returnValue([]));
         $expectedInvalidated = [
             self::TYPE_KEY => 1,
         ];
@@ -156,10 +174,8 @@ public function testInvalidateList()
             ->method('serialize')
             ->with($expectedInvalidated)
             ->willReturn('serializedData');
-        $this->_cache->expects($this->once())->method('save')->with(
-            'serializedData',
-            TypeList::INVALIDATED_TYPES
-        );
+        $this->_cache->expects($this->once())->method('save')
+            ->with('serializedData', TypeList::INVALIDATED_TYPES);
         $this->_typeList->invalidate([self::TYPE_KEY]);
     }
 
@@ -169,38 +185,36 @@ public function testCleanType()
             ->method('unserialize')
             ->with('serializedData')
             ->willReturn($this->_typesArray);
-        $this->_cache->expects($this->once())->method('load')->with(TypeList::INVALIDATED_TYPES)->will(
-            $this->returnValue('serializedData')
-        );
-        $this->_config->expects($this->once())->method('getType')->with(self::TYPE_KEY)->will(
-            $this->returnValue(['instance' => self::CACHE_TYPE])
-        );
+        $this->_cache->expects($this->once())->method('load')
+            ->with(TypeList::INVALIDATED_TYPES)
+            ->will($this->returnValue('serializedData'));
+        $this->_config->expects($this->once())->method('getType')
+            ->with(self::TYPE_KEY)
+            ->will($this->returnValue(['instance' => self::CACHE_TYPE]));
         unset($this->_typesArray[self::TYPE_KEY]);
         $this->serializerMock->expects($this->once())
             ->method('serialize')
             ->with($this->_typesArray)
             ->willReturn('serializedData');
-        $this->_cache->expects($this->once())->method('save')->with(
-            'serializedData',
-            TypeList::INVALIDATED_TYPES
-        );
+        $this->_cache->expects($this->once())->method('save')
+            ->with('serializedData', TypeList::INVALIDATED_TYPES);
         $this->_typeList->cleanType(self::TYPE_KEY);
     }
 
     /**
      * Returns prepared type
      *
-     * @return \Magento\Framework\DataObject
+     * @return DataObject
      */
     private function _getPreparedType()
     {
-        return new \Magento\Framework\DataObject(
+        return new DataObject(
             [
                 'id' => self::TYPE_KEY,
                 'cache_type' => $this->_typesArray[self::TYPE_KEY]['label'],
                 'description' => $this->_typesArray[self::TYPE_KEY]['description'],
-                'tags' => '',
-                'status' => self::IS_CACHE_ENABLED,
+                'tags' => 'TEST',
+                'status' => (int)self::IS_CACHE_ENABLED,
             ]
         );
     }
diff --git a/lib/internal/Magento/Framework/Cache/Config/Reader.php b/lib/internal/Magento/Framework/Cache/Config/Reader.php
index 445e91240e7e5..942a3931e0173 100644
--- a/lib/internal/Magento/Framework/Cache/Config/Reader.php
+++ b/lib/internal/Magento/Framework/Cache/Config/Reader.php
@@ -3,9 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Cache\Config;
 
-class Reader extends \Magento\Framework\Config\Reader\Filesystem
+use Magento\Framework\App\Area;
+use Magento\Framework\Config\Dom;
+use Magento\Framework\Config\FileResolverInterface;
+use Magento\Framework\Config\Reader\Filesystem;
+use Magento\Framework\Config\ValidationStateInterface;
+
+/**
+ * Cache configuration reader
+ */
+class Reader extends Filesystem
 {
     /**
      * List of id attributes for merge
@@ -15,24 +25,27 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
     protected $_idAttributes = ['/config/type' => 'name'];
 
     /**
-     * @param \Magento\Framework\Config\FileResolverInterface $fileResolver
+     * Initialize dependencies.
+     *
+     * @param FileResolverInterface $fileResolver
      * @param Converter $converter
      * @param SchemaLocator $schemaLocator
-     * @param \Magento\Framework\Config\ValidationStateInterface $validationState
+     * @param ValidationStateInterface $validationState
      * @param string $fileName
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
+     * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
      */
     public function __construct(
-        \Magento\Framework\Config\FileResolverInterface $fileResolver,
-        \Magento\Framework\Cache\Config\Converter $converter,
-        \Magento\Framework\Cache\Config\SchemaLocator $schemaLocator,
-        \Magento\Framework\Config\ValidationStateInterface $validationState,
+        FileResolverInterface $fileResolver,
+        Converter $converter,
+        SchemaLocator $schemaLocator,
+        ValidationStateInterface $validationState,
         $fileName = 'cache.xml',
         $idAttributes = [],
-        $domDocumentClass = \Magento\Framework\Config\Dom::class,
-        $defaultScope = 'global'
+        $domDocumentClass = Dom::class,
+        $defaultScope = Area::AREA_GLOBAL
     ) {
         parent::__construct(
             $fileResolver,
diff --git a/lib/internal/Magento/Framework/Cache/Config/SchemaLocator.php b/lib/internal/Magento/Framework/Cache/Config/SchemaLocator.php
index 5471dbcfb6c62..2d3be1b1a4067 100644
--- a/lib/internal/Magento/Framework/Cache/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/Cache/Config/SchemaLocator.php
@@ -7,6 +7,9 @@
  */
 namespace Magento\Framework\Cache\Config;
 
+/**
+ * Cache configuration schema locator
+ */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
     /**
@@ -15,6 +18,9 @@ class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
     protected $urnResolver;
 
     /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\Config\Dom\UrnResolver $urnResolver
      */
     public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolver)
     {
@@ -25,6 +31,7 @@ public function __construct(\Magento\Framework\Config\Dom\UrnResolver $urnResolv
      * Get path to merged config schema
      *
      * @return string|null
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function getSchema()
     {
@@ -34,10 +41,11 @@ public function getSchema()
     /**
      * Get path to pre file validation schema
      *
-     * @return null
+     * @return string|null
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function getPerFileSchema()
     {
-        return null;
+        return $this->urnResolver->getRealPath('urn:magento:framework:Cache/etc/cache.xsd');
     }
 }
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/Config/ConverterTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/Config/ConverterTest.php
deleted file mode 100644
index 7f86e162311c8..0000000000000
--- a/lib/internal/Magento/Framework/Cache/Test/Unit/Config/ConverterTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Framework\Cache\Test\Unit\Config;
-
-class ConverterTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Cache\Config\Converter
-     */
-    protected $_model;
-
-    protected function setUp()
-    {
-        $this->_model = new \Magento\Framework\Cache\Config\Converter();
-    }
-
-    public function testConvert()
-    {
-        $dom = new \DOMDocument();
-        $xmlFile = __DIR__ . '/_files/cache_config.xml';
-        $dom->loadXML(file_get_contents($xmlFile));
-
-        $convertedFile = __DIR__ . '/_files/cache_config.php';
-        $expectedResult = include $convertedFile;
-        $this->assertEquals($expectedResult, $this->_model->convert($dom));
-    }
-}
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/Config/_files/cache_config.php b/lib/internal/Magento/Framework/Cache/Test/Unit/Config/_files/cache_config.php
deleted file mode 100644
index 0a45e50bbe198..0000000000000
--- a/lib/internal/Magento/Framework/Cache/Test/Unit/Config/_files/cache_config.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-return [
-    'types' => [
-        'config' => [
-            'name' => 'config',
-            'translate' => 'label,description',
-            'instance' => \Magento\Framework\App\Cache\Type\Config::class,
-            'label' => 'Configuration',
-            'description' => 'Cache Description',
-        ],
-        'layout' => [
-            'name' => 'layout',
-            'translate' => 'label,description',
-            'instance' => \Magento\Framework\App\Cache\Type\Layout::class,
-            'label' => 'Layouts',
-            'description' => 'Layout building instructions',
-        ],
-    ]
-];
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/Config/_files/cache_config.xml b/lib/internal/Magento/Framework/Cache/Test/Unit/Config/_files/cache_config.xml
deleted file mode 100644
index 315ddd9cec67c..0000000000000
--- a/lib/internal/Magento/Framework/Cache/Test/Unit/Config/_files/cache_config.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Cache/etc/cache.xsd">
-    <type name="config" translate="label,description" instance="Magento\Framework\App\Cache\Type\Config">
-        <label>Configuration</label>
-        <description>Cache Description</description>
-    </type>
-    <type name="layout" translate="label,description" instance="Magento\Framework\App\Cache\Type\Layout">
-        <label>Layouts</label>
-        <description>Layout building instructions</description>
-    </type>
-</config>
diff --git a/lib/internal/Magento/Framework/Cache/etc/cache.xsd b/lib/internal/Magento/Framework/Cache/etc/cache.xsd
index 74b831bb6ac03..d997e295140f5 100644
--- a/lib/internal/Magento/Framework/Cache/etc/cache.xsd
+++ b/lib/internal/Magento/Framework/Cache/etc/cache.xsd
@@ -6,24 +6,36 @@
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:element name="config" type="configType" />
-
-    <xs:complexType name="configType">
-        <xs:sequence>
-            <xs:element type="cacheType" name="type" maxOccurs="unbounded" minOccurs="0"/>
-        </xs:sequence>
-    </xs:complexType>
-
     <xs:complexType name="cacheType">
         <xs:annotation>
-            <xs:documentation>Cache type declaration</xs:documentation>
+            <xs:documentation>
+                Cache type declaration
+            </xs:documentation>
         </xs:annotation>
-        <xs:choice maxOccurs="unbounded" minOccurs="0">
-            <xs:element name="label" type="xs:string" />
-            <xs:element name="description" type="xs:string" />
-        </xs:choice>
+        <xs:all>
+            <xs:element name="label" type="xs:string" minOccurs="1" maxOccurs="1"/>
+            <xs:element name="description" type="xs:string" minOccurs="1" maxOccurs="1"/>
+        </xs:all>
         <xs:attribute type="xs:string" name="name" use="required"/>
         <xs:attribute type="xs:string" name="translate" use="optional"/>
-        <xs:attribute type="xs:string" name="instance" use="optional"/>
+        <xs:attribute type="xs:string" name="instance" use="required"/>
+    </xs:complexType>
+
+    <xs:element name="config" type="configType">
+        <xs:unique name="uniqueCacheName">
+            <xs:annotation>
+                <xs:documentation>
+                    Cache name must be unique.
+                </xs:documentation>
+            </xs:annotation>
+            <xs:selector xpath="type"/>
+            <xs:field xpath="@name"/>
+        </xs:unique>
+    </xs:element>
+
+    <xs:complexType name="configType">
+        <xs:sequence>
+            <xs:element type="cacheType" name="type" maxOccurs="unbounded" minOccurs="1"/>
+        </xs:sequence>
     </xs:complexType>
 </xs:schema>