diff --git a/app/CMS/Helpers/Settings.php b/app/CMS/Helpers/Settings.php
index 805afd6d..58f39a02 100644
--- a/app/CMS/Helpers/Settings.php
+++ b/app/CMS/Helpers/Settings.php
@@ -79,7 +79,7 @@ class Settings
     {
         if (!self::$initialized) {
             self::$settings = Cache::remember('settings', config('cache.settingCacheLifetime'), function () {
-                app(SettingsRepository::class)->getAll();
+                return app(SettingsRepository::class)->getAll();
             });
         }
     }
diff --git a/app/CMS/Repositories/Module.php b/app/CMS/Repositories/Module.php
index b8320d39..0348ce57 100644
--- a/app/CMS/Repositories/Module.php
+++ b/app/CMS/Repositories/Module.php
@@ -1,9 +1,11 @@
 <?php
+
 namespace App\CMS\Repositories;
 
 use App\CMS\Contracts\Repositories\Module as IModule;
 use App\Models\Content\Content;
 use App\Models\Module as ModuleModel;
+use Illuminate\Support\Facades\Cache;
 
 class Module extends Repository implements IModule
 {
@@ -52,8 +54,10 @@ class Module extends Repository implements IModule
 
     public function all()
     {
-        return ModuleModel::where('enabled', true)
-                          ->get();
+        return Cache::rememberForever('enabled-modules-and-template', function () {
+            return ModuleModel::where('enabled', true)
+                              ->get();
+        });
     }
 
     public function getByHandler($handler)
diff --git a/app/CMS/Repositories/Settings/Settings.php b/app/CMS/Repositories/Settings/Settings.php
index e4110a38..fe680c5d 100644
--- a/app/CMS/Repositories/Settings/Settings.php
+++ b/app/CMS/Repositories/Settings/Settings.php
@@ -3,6 +3,7 @@
 namespace App\CMS\Repositories\Settings;
 
 use App\Models\Settings as SettingsModel;
+use Illuminate\Support\Facades\Cache;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 
 class Settings
@@ -104,5 +105,7 @@ class Settings
             $setting->value = $value;
             empty($value) ? $setting->delete() : $setting->save();
         }
+
+        Cache::forget('settings');
     }
 }
\ No newline at end of file
diff --git a/app/Console/Commands/Modules/DisableModule.php b/app/Console/Commands/Modules/DisableModule.php
index 823f52db..3ec0ad21 100644
--- a/app/Console/Commands/Modules/DisableModule.php
+++ b/app/Console/Commands/Modules/DisableModule.php
@@ -39,6 +39,9 @@ class DisableModule extends Command
         $module->enabled = false;
         $module->save();
 
+        \Cache::forget('enabled-modules');
+        \Cache::forget('enabled-modules-and-template');
+
         $this->line('Module ' . $module->static_name . ' disabled.');
     }
 }
diff --git a/app/Console/Commands/Modules/EnableModule.php b/app/Console/Commands/Modules/EnableModule.php
index 092afa0d..426c0cda 100644
--- a/app/Console/Commands/Modules/EnableModule.php
+++ b/app/Console/Commands/Modules/EnableModule.php
@@ -43,6 +43,9 @@ class EnableModule extends Command
         $module->enabled = true;
         $module->save();
 
+        \Cache::forget('enabled-modules');
+        \Cache::forget('enabled-modules-and-template');
+
         $this->line('Module ' . $module->static_name . ' enabled.');
     }
 }
diff --git a/app/Models/Module.php b/app/Models/Module.php
index d2bbf649..8b56b74d 100644
--- a/app/Models/Module.php
+++ b/app/Models/Module.php
@@ -15,7 +15,7 @@ class Module extends Model
         'parent_id',
         'name',
         'description',
-        'static_name', // @todo instalace potrebuje naplnit tento sloupec!
+        'static_name',
         'alias',
         'module_settings',
         'enabled',