diff --git a/src/Normalizer/FieldNormalizer.php b/src/Normalizer/FieldNormalizer.php
index 76bd532..4d57dd6 100644
--- a/src/Normalizer/FieldNormalizer.php
+++ b/src/Normalizer/FieldNormalizer.php
@@ -3,7 +3,6 @@
 namespace Drupal\jsonapi\Normalizer;
 
 use Drupal\Component\Assertion\Inspector;
-use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Field\EntityReferenceFieldItemList;
 use Drupal\Core\Field\FieldDefinitionInterface;
diff --git a/tests/modules/jsonapi_test_computed_field/src/JsonApiComputedFieldItemList.php b/tests/modules/jsonapi_test_computed_field/src/JsonApiComputedFieldItemList.php
index 1602ab4..9970342 100644
--- a/tests/modules/jsonapi_test_computed_field/src/JsonApiComputedFieldItemList.php
+++ b/tests/modules/jsonapi_test_computed_field/src/JsonApiComputedFieldItemList.php
@@ -19,14 +19,11 @@ class JsonApiComputedFieldItemList extends FieldItemList {
   protected function computeValue() {
     /** @var \Drupal\jsonapi_test_computed_field\Plugin\Field\FieldType\CacheableStringItem $item */
     $item = $this->createItem(0, 'jsonapi_test_computed_field');
-    /** @var \Drupal\jsonapi_test_computed_field\Plugin\DataType\CacheableStringData $value */
-    $value = $item->get('value');
     $cacheability = (new CacheableMetadata())
       ->setCacheContexts(['user'])
       ->setCacheTags(['field:jsonapi_test_computed_field'])
       ->setCacheMaxAge(800);
-    $value->setCacheability($cacheability);
-    $item->value = $value;
+    $item->get('value')->setCacheability($cacheability);
     $this->list[0] = $item;
   }
 
diff --git a/tests/src/Kernel/Serializer/ComputedFieldSerializerTest.php b/tests/src/Kernel/Serializer/ComputedFieldSerializerTest.php
index 9f28c87..11da5e7 100644
--- a/tests/src/Kernel/Serializer/ComputedFieldSerializerTest.php
+++ b/tests/src/Kernel/Serializer/ComputedFieldSerializerTest.php
@@ -35,7 +35,7 @@ class ComputedFieldSerializerTest extends JsonapiKernelTestBase {
    *
    * @var \Drupal\entity_test\Entity\EntityTest
    */
-  protected $entity_test;
+  protected $entity;
 
   /**
    * The subject under test.
@@ -61,11 +61,11 @@ class ComputedFieldSerializerTest extends JsonapiKernelTestBase {
     $this->user->save();
     $this->container->setAlias('sut', 'jsonapi.serializer_do_not_use_removal_imminent');
     $this->sut = $this->container->get('sut');
-    $this->entity_test = EntityTest::create([
+    $this->entity = EntityTest::create([
       'name' => 'Test Entity for Computed Field',
       'type' => 'entity_test',
     ]);
-    $this->entity_test->save();
+    $this->entity->save();
   }
 
   /**
@@ -73,7 +73,7 @@ class ComputedFieldSerializerTest extends JsonapiKernelTestBase {
    */
   public function testComputedFieldCacheablity() {
     $context = ['account' => $this->user];
-    $value = $this->sut->normalize($this->entity_test, 'api_json', $context);
+    $value = $this->sut->normalize($this->entity, 'api_json', $context);
     $this->assertInstanceOf(EntityNormalizerValue::class, $value);
     $this->assertContains('user', $value->getCacheContexts());
     $this->assertContains('field:jsonapi_test_computed_field', $value->getCacheTags());