diff --git a/src/flextype/Support/Serializers/Frontmatter.php b/src/flextype/Support/Serializers/Frontmatter.php
index 33ec001e49..3a6b75afd4 100644
--- a/src/flextype/Support/Serializers/Frontmatter.php
+++ b/src/flextype/Support/Serializers/Frontmatter.php
@@ -35,10 +35,10 @@ public function encode($input): string
         if (isset($input['content'])) {
             $content = $input['content'];
             $input   = arrays($input)->delete('content')->toArray();
-            $matter  = flextype('serializers')->yaml()->encode($input);
+            $matter  = serializers()->yaml()->encode($input);
         } else {
             $content = '';
-            $matter  = flextype('serializers')->yaml()->encode($input);
+            $matter  = serializers()->yaml()->encode($input);
         }
 
         return '---' . "\n" .
@@ -71,18 +71,18 @@ public function decode(string $input, bool $cache = true)
                 return ['content' => strings($input)->trim()->toString()];
             }
 
-            return flextype('serializers')->yaml()->decode(strings($parts[1])->trim()->toString(), false) + ['content' => strings(implode(PHP_EOL . '---' . PHP_EOL, array_slice($parts, 2)))->trim()->toString()];
+            return serializers()->yaml()->decode(strings($parts[1])->trim()->toString(), false) + ['content' => strings(implode(PHP_EOL . '---' . PHP_EOL, array_slice($parts, 2)))->trim()->toString()];
         };
 
-        if ($cache === true && flextype('registry')->get('flextype.settings.cache.enabled') === true) {
+        if ($cache === true && registry()->get('flextype.settings.cache.enabled') === true) {
             $key = $this->getCacheID($input);
 
-            if ($dataFromCache = flextype('cache')->get($key)) {
+            if ($dataFromCache = cache()->get($key)) {
                 return $dataFromCache;
             }
 
             $data = $decode($input);
-            flextype('cache')->set($key, $data);
+            cache()->set($key, $data);
 
             return $data;
         }
diff --git a/src/flextype/Support/Serializers/Json.php b/src/flextype/Support/Serializers/Json.php
index 4f43e9ce98..a6b627361d 100644
--- a/src/flextype/Support/Serializers/Json.php
+++ b/src/flextype/Support/Serializers/Json.php
@@ -80,15 +80,15 @@ public function decode(string $input, bool $cache = true, bool $assoc = true, in
             return $value;
         };
 
-        if ($cache === true && flextype('registry')->get('flextype.settings.cache.enabled') === true) {
+        if ($cache === true && registry()->get('flextype.settings.cache.enabled') === true) {
             $key = $this->getCacheID($input);
 
-            if ($dataFromCache = flextype('cache')->get($key)) {
+            if ($dataFromCache = cache()->get($key)) {
                 return $dataFromCache;
             }
 
             $data = $decode($input, $assoc, $depth, $flags);
-            flextype('cache')->set($key, $data);
+            cache()->set($key, $data);
 
             return $data;
         }
diff --git a/src/flextype/Support/Serializers/Yaml.php b/src/flextype/Support/Serializers/Yaml.php
index 6280885f13..0539114815 100644
--- a/src/flextype/Support/Serializers/Yaml.php
+++ b/src/flextype/Support/Serializers/Yaml.php
@@ -113,15 +113,15 @@ public function decode(string $input, bool $cache = true, int $flags = 0)
             }
         };
 
-        if ($cache === true && flextype('registry')->get('flextype.settings.cache.enabled') === true) {
+        if ($cache === true && registry()->get('flextype.settings.cache.enabled') === true) {
             $key = $this->getCacheID($input);
 
-            if ($dataFromCache = flextype('cache')->get($key)) {
+            if ($dataFromCache = cache()->get($key)) {
                 return $dataFromCache;
             }
 
             $data = $decode($input, $flags);
-            flextype('cache')->set($key, $data);
+            cache()->set($key, $data);
 
             return $data;
         }