diff --git a/config/autoload/logger.global.php b/config/autoload/logger.global.php
index 21bd2b8d..dd4d1d22 100644
--- a/config/autoload/logger.global.php
+++ b/config/autoload/logger.global.php
@@ -58,8 +58,8 @@ return [
 
     'dependencies' => [
         'factories' => [
-            'Logger_Shlink' => Common\Factory\LoggerFactory::class,
-            'Logger_Access' => Common\Factory\LoggerFactory::class,
+            'Logger_Shlink' => Common\Logger\LoggerFactory::class,
+            'Logger_Access' => Common\Logger\LoggerFactory::class,
         ],
     ],
 
diff --git a/indocker b/indocker
index 9b535ec7..789386ac 100755
--- a/indocker
+++ b/indocker
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 # Run docker containers if they are not up yet
-if ! [[ $(docker ps | grep shlink_php) ]]; then
+if ! [[ $(docker ps | grep shlink_swoole) ]]; then
     docker-compose up -d
 fi
 
-docker exec -it shlink_php /bin/sh -c "cd /home/shlink/www && $*"
+docker exec -it shlink_swoole /bin/sh -c "$*"
diff --git a/module/Common/config/dependencies.config.php b/module/Common/config/dependencies.config.php
index fc33f984..88d5d8b6 100644
--- a/module/Common/config/dependencies.config.php
+++ b/module/Common/config/dependencies.config.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\Common;
 
-use Doctrine\Common\Cache\Cache;
+use Doctrine\Common\Cache as DoctrineCache;
 use GeoIp2\Database\Reader;
 use GuzzleHttp\Client as GuzzleClient;
 use Monolog\Logger;
@@ -20,7 +20,7 @@ return [
     'dependencies' => [
         'factories' => [
             GuzzleClient::class => InvokableFactory::class,
-            Cache::class => Factory\CacheFactory::class,
+            DoctrineCache\Cache::class => Cache\CacheFactory::class,
             Filesystem::class => InvokableFactory::class,
             Reader::class => ConfigAbstractFactory::class,
 
diff --git a/module/Common/src/Factory/CacheFactory.php b/module/Common/src/Cache/CacheFactory.php
similarity index 84%
rename from module/Common/src/Factory/CacheFactory.php
rename to module/Common/src/Cache/CacheFactory.php
index 68628af0..907621ea 100644
--- a/module/Common/src/Factory/CacheFactory.php
+++ b/module/Common/src/Cache/CacheFactory.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\Factory;
+namespace Shlinkio\Shlink\Common\Cache;
 
 use Doctrine\Common\Cache;
 use Interop\Container\ContainerInterface;
@@ -14,6 +14,8 @@ class CacheFactory implements FactoryInterface
 {
     public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null): Cache\Cache
     {
+        // TODO Make use of the redis cache via RedisFactory when possible
+
         $appOptions = $container->get(AppOptions::class);
         $adapter = env('APP_ENV', 'pro') === 'pro' ? new Cache\ApcuCache() : new Cache\ArrayCache();
         $adapter->setNamespace((string) $appOptions);
diff --git a/module/Common/src/Factory/LoggerFactory.php b/module/Common/src/Logger/LoggerFactory.php
similarity index 97%
rename from module/Common/src/Factory/LoggerFactory.php
rename to module/Common/src/Logger/LoggerFactory.php
index 72c396e2..0671bbcc 100644
--- a/module/Common/src/Factory/LoggerFactory.php
+++ b/module/Common/src/Logger/LoggerFactory.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\Factory;
+namespace Shlinkio\Shlink\Common\Logger;
 
 use Cascade\Cascade;
 use Interop\Container\ContainerInterface;
diff --git a/module/Common/test/Factory/CacheFactoryTest.php b/module/Common/test/Cache/CacheFactoryTest.php
similarity index 92%
rename from module/Common/test/Factory/CacheFactoryTest.php
rename to module/Common/test/Cache/CacheFactoryTest.php
index d861b02b..d83d56b7 100644
--- a/module/Common/test/Factory/CacheFactoryTest.php
+++ b/module/Common/test/Cache/CacheFactoryTest.php
@@ -1,12 +1,12 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Common\Factory;
+namespace ShlinkioTest\Shlink\Common\Cache;
 
 use Doctrine\Common\Cache\ApcuCache;
 use Doctrine\Common\Cache\ArrayCache;
 use PHPUnit\Framework\TestCase;
-use Shlinkio\Shlink\Common\Factory\CacheFactory;
+use Shlinkio\Shlink\Common\Cache\CacheFactory;
 use Shlinkio\Shlink\Core\Options\AppOptions;
 use Zend\ServiceManager\ServiceManager;
 
diff --git a/module/Common/test/Factory/LoggerFactoryTest.php b/module/Common/test/Logger/LoggerFactoryTest.php
similarity index 93%
rename from module/Common/test/Factory/LoggerFactoryTest.php
rename to module/Common/test/Logger/LoggerFactoryTest.php
index 9f4a8a3c..ae20e161 100644
--- a/module/Common/test/Factory/LoggerFactoryTest.php
+++ b/module/Common/test/Logger/LoggerFactoryTest.php
@@ -1,12 +1,12 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Common\Factory;
+namespace ShlinkioTest\Shlink\Common\Logger;
 
 use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
-use Shlinkio\Shlink\Common\Factory\LoggerFactory;
+use Shlinkio\Shlink\Common\Logger\LoggerFactory;
 use Zend\ServiceManager\ServiceManager;
 
 class LoggerFactoryTest extends TestCase