diff --git a/application/Espo/Core/Utils/DataCache.php b/application/Espo/Core/Utils/DataCache.php
index 45735c9603..264a278425 100644
--- a/application/Espo/Core/Utils/DataCache.php
+++ b/application/Espo/Core/Utils/DataCache.php
@@ -61,8 +61,8 @@ class DataCache
     /**
      * Get a stored value.
      *
-     * @throws Error if is not cached.
-     * @return array<mixed,mixed>|stdClass|null
+     * @return array<mixed,mixed>|stdClass
+     * @throws Error If is not cached or bad data stored.
      */
     public function get(string $key)
     {
@@ -74,7 +74,7 @@ class DataCache
     /**
      * Store in cache.
      *
-     * @param array<mixed,mixed>|stdClass|null $data
+     * @param array<mixed,mixed>|stdClass $data
      */
     public function store(string $key, $data): void
     {
diff --git a/application/Espo/Core/Utils/Database/Converter.php b/application/Espo/Core/Utils/Database/Converter.php
index e73dfdec90..0ddfee9f77 100644
--- a/application/Espo/Core/Utils/Database/Converter.php
+++ b/application/Espo/Core/Utils/Database/Converter.php
@@ -64,7 +64,7 @@ class Converter
     }
 
     /**
-     * @return array<string,mixed>
+     * @return array<string,array<string,mixed>>
      */
     public function process()
     {
diff --git a/application/Espo/Core/Utils/Database/Orm/Converter.php b/application/Espo/Core/Utils/Database/Orm/Converter.php
index 8c0898f596..3a591690b3 100644
--- a/application/Espo/Core/Utils/Database/Orm/Converter.php
+++ b/application/Espo/Core/Utils/Database/Orm/Converter.php
@@ -188,7 +188,7 @@ class Converter
     /**
      * Covert metadata > entityDefs to ORM metadata.
      *
-     * @return array<string,mixed>
+     * @return array<string,array<string,mixed>>
      */
     public function process(): array
     {
diff --git a/application/Espo/Core/Utils/File/Manager.php b/application/Espo/Core/Utils/File/Manager.php
index 657698cac4..bffd5ab479 100644
--- a/application/Espo/Core/Utils/File/Manager.php
+++ b/application/Espo/Core/Utils/File/Manager.php
@@ -273,6 +273,7 @@ class Manager
      * If a file is not yet written, it will wait until it's ready.
      *
      * @return array<mixed,mixed>|stdClass
+     * @throws Error
      */
     public function getPhpSafeContents(string $path)
     {
diff --git a/application/Espo/Core/Utils/Metadata/OrmMetadataData.php b/application/Espo/Core/Utils/Metadata/OrmMetadataData.php
index bf743c8aa6..6947162768 100644
--- a/application/Espo/Core/Utils/Metadata/OrmMetadataData.php
+++ b/application/Espo/Core/Utils/Metadata/OrmMetadataData.php
@@ -92,7 +92,10 @@ class OrmMetadataData
         }
 
         if ($this->useCache && $this->dataCache->has($this->cacheKey) && !$reload) {
-            $this->data = $this->dataCache->get($this->cacheKey);
+            /** @var array<string,array<string,mixed>> */
+            $data = $this->dataCache->get($this->cacheKey);
+
+            $this->data = $data;
 
             return $this->data;
         }
diff --git a/application/Espo/Core/Utils/Module.php b/application/Espo/Core/Utils/Module.php
index 721ffb86e0..91a38c61a5 100644
--- a/application/Espo/Core/Utils/Module.php
+++ b/application/Espo/Core/Utils/Module.php
@@ -111,14 +111,12 @@ class Module
     private function init(): void
     {
         if ($this->useCache && $this->dataCache->has($this->cacheKey)) {
-            /** @var ?array<string,array<string,mixed>> */
+            /** @var array<string,array<string,mixed>> */
             $data = $this->dataCache->get($this->cacheKey);
 
             $this->data = $data;
 
-            if ($data !== null) {
-                return;
-            }
+            return;
         }
 
         $this->data = $this->loadData();
diff --git a/application/Espo/Core/Utils/Route.php b/application/Espo/Core/Utils/Route.php
index 0e05aa3cd7..538aef04f2 100644
--- a/application/Espo/Core/Utils/Route.php
+++ b/application/Espo/Core/Utils/Route.php
@@ -124,9 +124,7 @@ class Route
 
             $this->data = $data;
 
-            if ($this->data !== null) {
-                return;
-            }
+            return;
         }
 
         $this->data = $this->unify();