diff --git a/core/lib/Drupal/Core/Image/Image.php b/core/lib/Drupal/Core/Image/Image.php
index 1eaf966..e41bd3e 100644
--- a/core/lib/Drupal/Core/Image/Image.php
+++ b/core/lib/Drupal/Core/Image/Image.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\Core\Image;
 
+use Drupal\Core\ImageToolkit\ImageToolkitExifInterface;
 use Drupal\Core\ImageToolkit\ImageToolkitInterface;
 
 /**
@@ -17,7 +18,7 @@
  *
  * @ingroup image
  */
-class Image implements ImageInterface {
+class Image implements ImageInterface, ImageExifInterface {
 
   /**
    * Path of the image file.
@@ -107,14 +108,20 @@ public function getSource() {
    * {@inheritdoc}
    */
   public function getExif($tag = NULL) {
-    return $this->getToolkit()->getExif($tag);
+    if ($this->getToolkit() instanceof ImageToolkitExifInterface) {
+      return $this->getToolkit()->getExif($tag);
+    }
+    return NULL;
   }
 
   /**
    * {@inheritdoc}
    */
   public function getExifStatus() {
-    return $this->getToolkit()->getExifStatus();
+    if ($this->getToolkit() instanceof ImageToolkitExifInterface) {
+      return $this->getToolkit()->getExifStatus();
+    }
+    return NULL;
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Image/ImageExifInterface.php b/core/lib/Drupal/Core/Image/ImageExifInterface.php
new file mode 100644
index 0000000..c021184
--- /dev/null
+++ b/core/lib/Drupal/Core/Image/ImageExifInterface.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Image\ImageExifInterface.
+ */
+
+namespace Drupal\Core\Image;
+
+/**
+ * Provides an interface for managing EXIF image data.
+ */
+interface ImageExifInterface {
+
+  /**
+   * Returns EXIF information retrieved from the image file.
+   *
+   * @param string $tag
+   *   (optional) The EXIF tag to return information about, or NULL to return
+   *   the entire array of EXIF data. Defaults to NULL.
+   *
+   * @return mixed|null
+   *   The value of the EXIF tag if specified, or the entire EXIF data array
+   *   if tag is not specified. NULL if data could not be retrieved.
+   */
+  public function getExif($tag = NULL);
+
+  /**
+   * Returns the status of reading EXIF information from the image file.
+   *
+   * EXIF information contained in image files is only parsed upon first call
+   * of the ::getExif method. This method returns information about the
+   * internal status of EXIF data within the image system. It can take the
+   * following values:
+   * - ImageToolkitExifInterface::EXIF_NOT_PARSED - the image file EXIF data
+   *   has not been parsed yet.
+   * - ImageToolkitExifInterface::EXIF_UNSUPPORTED_FORMAT - the image file
+   *   format does not support EXIF.
+   * - ImageToolkitExifInterface::EXIF_RESET - the image EXIF data was reset
+   *   (for example, creating a new image).
+   * - ImageToolkitExifInterface::EXIF_NO_PHP_EXTENSION - the image EXIF data
+   *   could not be parsed, the EXIF PHP extension is missing.
+   * - ImageToolkitExifInterface::EXIF_PARSE_FAILURE - the image EXIF data
+   *   could not be parsed, there was a parsing error.
+   * - ImageToolkitExifInterface::EXIF_PARSED_OK - the image EXIF has been
+   *   parsed successfully.
+   *
+   * @return int
+   *   The status of the EXIF information.
+   *
+   * @see ::getExif
+   * @see \Drupal\Core\ImageToolkit\ImageToolkitExifInterface
+   */
+  public function getExifStatus();
+
+}
diff --git a/core/lib/Drupal/Core/Image/ImageInterface.php b/core/lib/Drupal/Core/Image/ImageInterface.php
index 5a0a643..2c953f5 100644
--- a/core/lib/Drupal/Core/Image/ImageInterface.php
+++ b/core/lib/Drupal/Core/Image/ImageInterface.php
@@ -63,27 +63,6 @@ public function getMimeType();
   public function getSource();
 
   /**
-   * Returns EXIF information from the image file.
-   *
-   * @param string $tag
-   *   (optional) The EXIF tag to return information about, or NULL to return
-   *   the entire array of EXIF data. Defaults to NULL.
-   *
-   * @return mixed|null
-   *   The value of the EXIF tag if specified, or the entire EXIF data array
-   *   if tag is not specified. NULL if data could not be retrieved.
-   */
-  public function getExif($tag = NULL);
-
-  /**
-   * Returns status of EXIF information.
-   *
-   * @return int
-   *   The status of the EXIF information.
-   */
-  public function getExifStatus();
-
-  /**
    * Returns the image toolkit used for this image file.
    *
    * @return \Drupal\Core\ImageToolkit\ImageToolkitInterface
diff --git a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitBase.php b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitBase.php
index 10da40e..05dd292 100644
--- a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitBase.php
+++ b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitBase.php
@@ -21,7 +21,7 @@
  * @see \Drupal\Core\ImageToolkit\ImageToolkitManager
  * @see plugin_api
  */
-abstract class ImageToolkitBase extends PluginBase implements ImageToolkitInterface {
+abstract class ImageToolkitBase extends PluginBase implements ImageToolkitInterface, ImageToolkitExifInterface {
 
   /**
    * The config factory.
@@ -56,7 +56,7 @@
    *
    * @var int
    */
-  protected $exifStatus = ImageToolkitInterface::EXIF_NOT_PARSED;
+  protected $exifStatus = ImageToolkitExifInterface::EXIF_NOT_PARSED;
 
   /**
    * A copy of source image EXIF information.
@@ -128,9 +128,8 @@ public function getExif($tag = NULL) {
       }
       return $this->exifData;
     }
-    else {
-      return $tag ? NULL : $this->exifData;
-    }
+
+    return NULL;
   }
 
   /**
@@ -176,7 +175,7 @@ protected function parseExifData() {
     // Check if function is available.
     if (!function_exists('exif_read_data')) {
       // No PHP EXIF extension enabled, return.
-      $this->logger->error('The PHP EXIF extension is not installed. The image toolkit is unable to determine image orientation.');
+      $this->logger->error('The PHP EXIF extension is not installed. The image toolkit is unable to retrieve image EXIF data.');
       $this->setExifData([], static::EXIF_NO_PHP_EXTENSION);
       return $this;
     }
diff --git a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitExifInterface.php b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitExifInterface.php
new file mode 100644
index 0000000..79c8936
--- /dev/null
+++ b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitExifInterface.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\ImageToolkit\ImageToolkitExifInterface.
+ */
+
+namespace Drupal\Core\ImageToolkit;
+
+/**
+ * Defines an interface for image EXIF data management in image toolkits.
+ */
+interface ImageToolkitExifInterface {
+
+  /**
+   * Indicates that the image EXIF data has not been parsed yet.
+   */
+  const EXIF_NOT_PARSED = 0;
+
+  /**
+   * Indicates that the image format does not support EXIF data.
+   */
+  const EXIF_UNSUPPORTED_FORMAT = 1;
+
+  /**
+   * Indicates that the image EXIF data was reset (e.g. creating a new image).
+   */
+  const EXIF_RESET = 2;
+
+  /**
+   * Indicates that the image EXIF data could not be parsed - no PHP extension.
+   */
+  const EXIF_NO_PHP_EXTENSION = 3;
+
+  /**
+   * Indicates that the image EXIF data could not be parsed - parse failure.
+   */
+  const EXIF_PARSE_FAILURE = 4;
+
+  /**
+   * Indicates that the image EXIF data was parsed successfully.
+   */
+  const EXIF_PARSED_OK = 100;
+
+  /**
+   * Returns EXIF information retrieved from the image file.
+   *
+   * @param string $tag
+   *   (optional) The EXIF tag to return information about, or NULL to return
+   *   the entire array of EXIF data. Defaults to NULL.
+   *
+   * @return mixed|null
+   *   The value of the EXIF tag if specified, or the entire EXIF data array
+   *   if tag is not specified. NULL if data could not be retrieved.
+   */
+  public function getExif($tag = NULL);
+
+  /**
+   * Sets a copy of EXIF information retrieved from the image file.
+   *
+   * Keeps a copy of EXIF information retrieved from the image file in a
+   * protected property to access it from memory on repeated calls. Note that
+   * this method does not update the EXIF information in the source file.
+   *
+   * @param array $exif_data
+   *   The array of EXIF data as retrieved from the source file.
+   * @param string $exif_status
+   *   (optional) The status of the EXIF data retrieval. Defaults to NULL.
+   *
+   * @return $this
+   */
+  public function setExifData(array $exif_data, $exif_status = NULL);
+
+  /**
+   * Returns the status of reading EXIF information from the image file.
+   *
+   * EXIF information contained in image files is only parsed upon first call
+   * of the ::getExif method. This method returns information about the
+   * internal status of EXIF data within the image toolkit. It can take the
+   * following values:
+   * - ImageToolkitExifInterface::EXIF_NOT_PARSED - the image file EXIF data
+   *   has not been parsed yet.
+   * - ImageToolkitExifInterface::EXIF_UNSUPPORTED_FORMAT - the image file
+   *   format does not support EXIF.
+   * - ImageToolkitExifInterface::EXIF_RESET - the image EXIF data was reset
+   *   (for example, creating a new image).
+   * - ImageToolkitExifInterface::EXIF_NO_PHP_EXTENSION - the image EXIF data
+   *   could not be parsed, the EXIF PHP extension is missing.
+   * - ImageToolkitExifInterface::EXIF_PARSE_FAILURE - the image EXIF data
+   *   could not be parsed, there was a parsing error.
+   * - ImageToolkitExifInterface::EXIF_PARSED_OK - the image EXIF has been
+   *   parsed successfully.
+   *
+   * @return int
+   *   The status of the EXIF information.
+   *
+   * @see ::getExif
+   */
+  public function getExifStatus();
+
+}
diff --git a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitInterface.php b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitInterface.php
index 3217d66..c7b064c 100644
--- a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitInterface.php
+++ b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitInterface.php
@@ -52,36 +52,6 @@
 interface ImageToolkitInterface extends ContainerFactoryPluginInterface, PluginInspectionInterface, PluginFormInterface {
 
   /**
-   * Indicates that the image EXIF data has not been parsed yet.
-   */
-  const EXIF_NOT_PARSED = 0;
-
-  /**
-   * Indicates that the image format does not support EXIF data.
-   */
-  const EXIF_UNSUPPORTED_FORMAT = 1;
-
-  /**
-   * Indicates that the image EXIF data was reset (e.g. creating a new image).
-   */
-  const EXIF_RESET = 2;
-
-  /**
-   * Indicates that the image EXIF data could not be parsed - no PHP extension.
-   */
-  const EXIF_NO_PHP_EXTENSION = 3;
-
-  /**
-   * Indicates that the image EXIF data could not be parsed - parse failure.
-   */
-  const EXIF_PARSE_FAILURE = 4;
-
-  /**
-   * Indicates that the image EXIF data was parsed successfully.
-   */
-  const EXIF_PARSED_OK = 100;
-
-  /**
    * Sets the source path of the image file.
    *
    * @param string $source
@@ -162,39 +132,6 @@ public function getWidth();
   public function getMimeType();
 
   /**
-   * Returns EXIF information from the image file.
-   *
-   * @param string $tag
-   *   (optional) The EXIF tag to return information about, or NULL to return
-   *   the entire array of EXIF data. Defaults to NULL.
-   *
-   * @return mixed|null
-   *   The value of the EXIF tag if specified, or the entire EXIF data array
-   *   if tag is not specified. NULL if data could not be retrieved.
-   */
-  public function getExif($tag = NULL);
-
-  /**
-   * Stores EXIF information from the image file.
-   *
-   * @param array $exif_data
-   *   The array of EXIF data as retrieved from the source file.
-   * @param string $exif_status
-   *   (optional) The status of the EXIF data retrieval. Defaults to NULL.
-   *
-   * @return $this
-   */
-  public function setExifData(array $exif_data, $exif_status = NULL);
-
-  /**
-   * Returns status of EXIF information.
-   *
-   * @return int
-   *   The status of the EXIF information.
-   */
-  public function getExifStatus();
-
-  /**
    * Gets toolkit requirements in a format suitable for hook_requirements().
    *
    * @return array
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/CreateNew.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/CreateNew.php
index 5386873..2298a04 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/CreateNew.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/CreateNew.php
@@ -8,7 +8,7 @@
 namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
 
 use Drupal\Component\Utility\Color;
-use Drupal\Core\ImageToolkit\ImageToolkitInterface;
+use Drupal\Core\ImageToolkit\ImageToolkitExifInterface;
 
 /**
  * Defines GD2 create_new image operation.
@@ -135,7 +135,7 @@ protected function execute(array $arguments) {
         imagedestroy($original_res);
       }
       // Reset EXIF information on new image.
-      $this->getToolkit()->setExifData([], ImageToolkitInterface::EXIF_RESET);
+      $this->getToolkit()->setExifData([], ImageToolkitExifInterface::EXIF_RESET);
     }
 
     return TRUE;
diff --git a/core/tests/Drupal/Tests/Core/Image/ImageTest.php b/core/tests/Drupal/Tests/Core/Image/ImageTest.php
index f53d5c6..7b82745 100644
--- a/core/tests/Drupal/Tests/Core/Image/ImageTest.php
+++ b/core/tests/Drupal/Tests/Core/Image/ImageTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\Tests\Core\Image;
 
 use Drupal\Core\Image\Image;
+use Drupal\Core\ImageToolkit\ImageToolkitExifInterface;
 use Drupal\Core\ImageToolkit\ImageToolkitInterface;
 use Drupal\Tests\UnitTestCase;
 
@@ -290,26 +291,26 @@ public function testParseFileFails() {
   public function testExif() {
     // Test a PNG image (not EXIF enabled).
     $this->getTestImage();
-    $this->assertEquals(ImageToolkitInterface::EXIF_NOT_PARSED, $this->image->getExifStatus());
+    $this->assertEquals(ImageToolkitExifInterface::EXIF_NOT_PARSED, $this->image->getExifStatus());
     $this->assertNull($this->image->getExif('Orientation'));
-    $this->assertEquals(ImageToolkitInterface::EXIF_UNSUPPORTED_FORMAT, $this->image->getExifStatus());
+    $this->assertEquals(ImageToolkitExifInterface::EXIF_UNSUPPORTED_FORMAT, $this->image->getExifStatus());
     $this->assertNull($this->image->getExif('FileName'));
     $this->assertEquals([], $this->image->getExif());
 
     // Test a JPEG image without EXIF data.
     $source = __DIR__ . '/../../../../../modules/simpletest/files/image-test.jpg';
     $this->getTestImage(TRUE, [], $source);
-    $this->assertEquals(ImageToolkitInterface::EXIF_NOT_PARSED, $this->image->getExifStatus());
+    $this->assertEquals(ImageToolkitExifInterface::EXIF_NOT_PARSED, $this->image->getExifStatus());
     $this->assertNull($this->image->getExif('Orientation'));
-    $this->assertEquals(ImageToolkitInterface::EXIF_PARSED_OK, $this->image->getExifStatus());
+    $this->assertEquals(ImageToolkitExifInterface::EXIF_PARSED_OK, $this->image->getExifStatus());
     $this->assertEquals('image-test.jpg', $this->image->getExif('FileName'));
 
     // Test a JPEG image with EXIF data.
     $source = __DIR__ . '/../../../../../modules/simpletest/files/image-test-exif.jpeg';
     $this->getTestImageForOperation('CreateNew', [], $source);
-    $this->assertEquals(ImageToolkitInterface::EXIF_NOT_PARSED, $this->image->getExifStatus());
+    $this->assertEquals(ImageToolkitExifInterface::EXIF_NOT_PARSED, $this->image->getExifStatus());
     $this->assertEquals(8, $this->image->getExif('Orientation'));
-    $this->assertEquals(ImageToolkitInterface::EXIF_PARSED_OK, $this->image->getExifStatus());
+    $this->assertEquals(ImageToolkitExifInterface::EXIF_PARSED_OK, $this->image->getExifStatus());
     $this->assertEquals('106/32', $this->image->getExif('ShutterSpeedValue'));
     $expected_thumbnail = [
       'Compression' => 6,
@@ -325,7 +326,7 @@ public function testExif() {
 
     // Test resetting EXIF data via createNew.
     $this->image->createNew(200, 200);
-    $this->assertEquals(ImageToolkitInterface::EXIF_RESET, $this->image->getExifStatus());
+    $this->assertEquals(ImageToolkitExifInterface::EXIF_RESET, $this->image->getExifStatus());
     $this->assertEquals([], $this->image->getExif());
   }