diff --git a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php
index dfd2e45..c05d23b 100644
--- a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php
+++ b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php
@@ -36,10 +36,10 @@ class ImageToolkitOperationManager extends DefaultPluginManager implements Image
    *   The module handler to invoke the alter hook with.
    */
   public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ModuleHandlerInterface $module_handler) {
-    parent::__construct('Plugin/ImageToolkit/Operation', $namespaces, 'Drupal\Core\ImageToolkit\Annotation\ImageToolkitOperation');
+    parent::__construct('Plugin/ImageToolkit/Operation', $namespaces, $module_handler, 'Drupal\Core\ImageToolkit\Annotation\ImageToolkitOperation');
 
     $this->alterInfo($module_handler, 'image_toolkit_operation');
-    $this->setCacheBackend($cache_backend, $language_manager, 'image_toolkit_operation');
+    $this->setCacheBackend($cache_backend, $language_manager, 'image_toolkit_operation_plugins');
   }
 
   /**
diff --git a/core/tests/Drupal/Tests/Core/Image/ImageTest.php b/core/tests/Drupal/Tests/Core/Image/ImageTest.php
index 5ff9751..1caed23 100644
--- a/core/tests/Drupal/Tests/Core/Image/ImageTest.php
+++ b/core/tests/Drupal/Tests/Core/Image/ImageTest.php
@@ -348,7 +348,7 @@ public function testScaleHeight() {
       ->method('apply')
       ->will($this->returnArgument(1));
 
-    $ret = $this->image->apply('scale', array('height' => 50));
+    $ret = $this->image->apply('scale', array('height' => 50, 'upscale' => FALSE));
     $this->assertEquals(44, $ret['width']);
   }
 
@@ -361,7 +361,7 @@ public function testScaleSame() {
     $this->toolkitOperation->expects($this->never())
       ->method('apply');
 
-    $ret = $this->image->apply('scale', array ('width' => 88, 'height' => 100));
+    $ret = $this->image->apply('scale', array ('width' => 88, 'height' => 100, 'upscale' => FALSE));
   }
 
   /**
@@ -373,7 +373,7 @@ public function testScaleAndCropWidth() {
       ->method('apply')
       ->will($this->returnArgument(1));
 
-    $ret = $this->image->apply('scale_and_crop', array ('width' => 34, 'height' => 50));
+    $ret = $this->image->apply('scale_and_crop', array ('width' => 34, 'height' => 50, 'upscale' => FALSE));
     $this->assertEquals(5, $ret['x']);
   }