diff --git a/src/network/mcpe/NetworkSession.php b/src/network/mcpe/NetworkSession.php
index b7cfdd44b..6ece36ac1 100644
--- a/src/network/mcpe/NetworkSession.php
+++ b/src/network/mcpe/NetworkSession.php
@@ -37,6 +37,7 @@ use pocketmine\event\server\DataPacketSendEvent;
 use pocketmine\form\Form;
 use pocketmine\math\Vector3;
 use pocketmine\network\BadPacketException;
+use pocketmine\network\mcpe\cache\ChunkCache;
 use pocketmine\network\mcpe\compression\CompressBatchPromise;
 use pocketmine\network\mcpe\compression\Compressor;
 use pocketmine\network\mcpe\compression\DecompressionException;
diff --git a/src/network/mcpe/ChunkCache.php b/src/network/mcpe/cache/ChunkCache.php
similarity index 98%
rename from src/network/mcpe/ChunkCache.php
rename to src/network/mcpe/cache/ChunkCache.php
index 5985b9e3c..790a14a66 100644
--- a/src/network/mcpe/ChunkCache.php
+++ b/src/network/mcpe/cache/ChunkCache.php
@@ -21,9 +21,10 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\network\mcpe;
+namespace pocketmine\network\mcpe\cache;
 
 use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\ChunkRequestTask;
 use pocketmine\network\mcpe\compression\CompressBatchPromise;
 use pocketmine\network\mcpe\compression\Compressor;
 use pocketmine\world\ChunkListener;
diff --git a/src/network/mcpe/CraftingDataCache.php b/src/network/mcpe/cache/CraftingDataCache.php
similarity index 99%
rename from src/network/mcpe/CraftingDataCache.php
rename to src/network/mcpe/cache/CraftingDataCache.php
index 84b7e490c..1f1c810a6 100644
--- a/src/network/mcpe/CraftingDataCache.php
+++ b/src/network/mcpe/cache/CraftingDataCache.php
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\network\mcpe;
+namespace pocketmine\network\mcpe\cache;
 
 use pocketmine\crafting\CraftingManager;
 use pocketmine\item\Item;
diff --git a/src/network/mcpe/StaticPacketCache.php b/src/network/mcpe/cache/StaticPacketCache.php
similarity index 98%
rename from src/network/mcpe/StaticPacketCache.php
rename to src/network/mcpe/cache/StaticPacketCache.php
index 6ef7e8aed..51bc879e0 100644
--- a/src/network/mcpe/StaticPacketCache.php
+++ b/src/network/mcpe/cache/StaticPacketCache.php
@@ -21,7 +21,7 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\network\mcpe;
+namespace pocketmine\network\mcpe\cache;
 
 use pocketmine\network\mcpe\protocol\AvailableActorIdentifiersPacket;
 use pocketmine\network\mcpe\protocol\BiomeDefinitionListPacket;
@@ -66,4 +66,4 @@ class StaticPacketCache{
 	public function getAvailableActorIdentifiers() : AvailableActorIdentifiersPacket{
 		return $this->availableActorIdentifiers;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/network/mcpe/handler/PreSpawnPacketHandler.php b/src/network/mcpe/handler/PreSpawnPacketHandler.php
index f40dc13a1..4d74fe854 100644
--- a/src/network/mcpe/handler/PreSpawnPacketHandler.php
+++ b/src/network/mcpe/handler/PreSpawnPacketHandler.php
@@ -24,16 +24,16 @@ declare(strict_types=1);
 namespace pocketmine\network\mcpe\handler;
 
 use pocketmine\data\bedrock\LegacyItemIdToStringIdMap;
+use pocketmine\network\mcpe\cache\CraftingDataCache;
+use pocketmine\network\mcpe\cache\StaticPacketCache;
 use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
 use pocketmine\network\mcpe\convert\TypeConverter;
-use pocketmine\network\mcpe\CraftingDataCache;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\RequestChunkRadiusPacket;
 use pocketmine\network\mcpe\protocol\StartGamePacket;
 use pocketmine\network\mcpe\protocol\types\BoolGameRule;
 use pocketmine\network\mcpe\protocol\types\DimensionIds;
 use pocketmine\network\mcpe\protocol\types\SpawnSettings;
-use pocketmine\network\mcpe\StaticPacketCache;
 use pocketmine\player\Player;
 use pocketmine\Server;