diff --git a/src/app/Console/Commands/Scalpel/TenantSetting/CreateCommand.php b/src/app/Console/Commands/Scalpel/TenantSetting/CreateCommand.php
index 1ba8e11d..44b590c0 100644
--- a/src/app/Console/Commands/Scalpel/TenantSetting/CreateCommand.php
+++ b/src/app/Console/Commands/Scalpel/TenantSetting/CreateCommand.php
@@ -1,14 +1,13 @@
 <?php
 
 namespace App\Console\Commands\Scalpel\TenantSetting;
 
 use App\Console\ObjectCreateCommand;
 
 class CreateCommand extends ObjectCreateCommand
 {
-    protected $cacheKeys = ['app\tenant_settings_%tenant_id%'];
     protected $commandPrefix = 'scalpel';
     protected $objectClass = \App\TenantSetting::class;
     protected $objectName = 'tenant-setting';
     protected $objectTitle = null;
 }
diff --git a/src/app/Console/Commands/Scalpel/TenantSetting/UpdateCommand.php b/src/app/Console/Commands/Scalpel/TenantSetting/UpdateCommand.php
index e043739b..b566b80e 100644
--- a/src/app/Console/Commands/Scalpel/TenantSetting/UpdateCommand.php
+++ b/src/app/Console/Commands/Scalpel/TenantSetting/UpdateCommand.php
@@ -1,14 +1,13 @@
 <?php
 
 namespace App\Console\Commands\Scalpel\TenantSetting;
 
 use App\Console\ObjectUpdateCommand;
 
 class UpdateCommand extends ObjectUpdateCommand
 {
-    protected $cacheKeys = ['app\tenant_settings_%tenant_id%'];
     protected $commandPrefix = 'scalpel';
     protected $objectClass = \App\TenantSetting::class;
     protected $objectName = 'tenant-setting';
     protected $objectTitle = null;
 }
diff --git a/src/app/Console/Commands/Scalpel/WalletSetting/CreateCommand.php b/src/app/Console/Commands/Scalpel/WalletSetting/CreateCommand.php
index 7c1f9ef3..1cd541c0 100644
--- a/src/app/Console/Commands/Scalpel/WalletSetting/CreateCommand.php
+++ b/src/app/Console/Commands/Scalpel/WalletSetting/CreateCommand.php
@@ -1,14 +1,13 @@
 <?php
 
 namespace App\Console\Commands\Scalpel\WalletSetting;
 
 use App\Console\ObjectCreateCommand;
 
 class CreateCommand extends ObjectCreateCommand
 {
-    protected $cacheKeys = ['app\wallet_settings_%wallet_id%'];
     protected $commandPrefix = 'scalpel';
     protected $objectClass = \App\WalletSetting::class;
     protected $objectName = 'wallet-setting';
     protected $objectTitle = null;
 }
diff --git a/src/app/Console/Commands/Scalpel/WalletSetting/UpdateCommand.php b/src/app/Console/Commands/Scalpel/WalletSetting/UpdateCommand.php
index bd61ee27..2193767e 100644
--- a/src/app/Console/Commands/Scalpel/WalletSetting/UpdateCommand.php
+++ b/src/app/Console/Commands/Scalpel/WalletSetting/UpdateCommand.php
@@ -1,14 +1,13 @@
 <?php
 
 namespace App\Console\Commands\Scalpel\WalletSetting;
 
 use App\Console\ObjectUpdateCommand;
 
 class UpdateCommand extends ObjectUpdateCommand
 {
-    protected $cacheKeys = ['app\wallet_settings_%wallet_id%'];
     protected $commandPrefix = 'scalpel';
     protected $objectClass = \App\WalletSetting::class;
     protected $objectName = 'wallet-setting';
     protected $objectTitle = null;
 }
diff --git a/src/app/Console/ObjectCommand.php b/src/app/Console/ObjectCommand.php
index 18d129ca..fa3dbc21 100644
--- a/src/app/Console/ObjectCommand.php
+++ b/src/app/Console/ObjectCommand.php
@@ -1,80 +1,55 @@
 <?php
 
 namespace App\Console;
 
 use Illuminate\Support\Facades\Cache;
 
 abstract class ObjectCommand extends Command
 {
     /**
      * Specify a command prefix, if any.
      *
      * For example, \App\Console\Commands\Scalpel\User\CreateCommand uses prefix 'scalpel'.
      *
      * @var string
      */
     protected $commandPrefix = '';
 
     /**
      * The object class that we are operating on, for example \App\User::class
      *
      * @var string
      */
     protected $objectClass;
 
     /**
      * The (simple) object name, such as 'domain' or 'user'. Corresponds with the mandatory command-line option
      * to identify the object from its corresponding model.
      *
      * @var string
      */
     protected $objectName;
 
     /**
      * The plural of the object name, if something specific (goose -> geese).
      *
      * @var string
      */
     protected $objectNamePlural;
 
     /**
      * A column name other than the primary key can be used to identify an object, such as 'email' for users,
      * 'namespace' for domains, and 'title' for SKUs.
      *
      * @var string
      */
     protected $objectTitle;
 
     /**
      * Placeholder for column name attributes for objects, from which command-line switches and attribute names can be
      * generated.
      *
      * @var array
      */
     protected $properties;
-
-    /**
-     * List of cache keys to refresh after updating/creating an object
-     *
-     * @var array
-     */
-    protected $cacheKeys = [];
-
-    /**
-     * Reset the cache for specified object using defined cacheKeys.
-     *
-     * @param object $object The object that was updated/created
-     */
-    protected function cacheRefresh($object): void
-    {
-        foreach ($this->cacheKeys as $cacheKey) {
-            foreach ($object->toArray() as $propKey => $propValue) {
-                if (!is_object($propValue)) {
-                    $cacheKey = str_replace('%' . $propKey . '%', $propValue, $cacheKey);
-                }
-            }
-
-            Cache::forget($cacheKey);
-        }
-    }
 }
diff --git a/src/app/Console/ObjectCreateCommand.php b/src/app/Console/ObjectCreateCommand.php
index 76f9a8b1..c38e5d84 100644
--- a/src/app/Console/ObjectCreateCommand.php
+++ b/src/app/Console/ObjectCreateCommand.php
@@ -1,65 +1,64 @@
 <?php
 
 namespace App\Console;
 
 /**
  * This abstract class provides a means to treat objects in our model using CRUD.
  */
 abstract class ObjectCreateCommand extends ObjectCommand
 {
     public function __construct()
     {
         $this->description = "Create a {$this->objectName}";
         $this->signature = sprintf(
             "%s%s:create",
             $this->commandPrefix ? $this->commandPrefix . ":" : "",
             $this->objectName
         );
 
         $class = new $this->objectClass();
 
         foreach ($class->getFillable() as $fillable) {
             $this->signature .= " {--{$fillable}=}";
         }
 
         parent::__construct();
     }
 
     public function getProperties()
     {
         if (!empty($this->properties)) {
             return $this->properties;
         }
 
         $class = new $this->objectClass();
 
         $this->properties = [];
 
         foreach ($class->getFillable() as $fillable) {
             $this->properties[$fillable] = $this->option($fillable);
         }
 
         return $this->properties;
     }
 
     /**
      * Execute the console command.
      *
      * @return mixed
      */
     public function handle()
     {
         $this->getProperties();
 
         $class = new $this->objectClass();
 
         $object = $this->objectClass::create($this->properties);
 
         if ($object) {
-            $this->cacheRefresh($object);
             $this->info($object->{$class->getKeyName()});
         } else {
             $this->error("Object could not be created.");
         }
     }
 }
diff --git a/src/app/Console/ObjectUpdateCommand.php b/src/app/Console/ObjectUpdateCommand.php
index c33cb6ba..5d764e8d 100644
--- a/src/app/Console/ObjectUpdateCommand.php
+++ b/src/app/Console/ObjectUpdateCommand.php
@@ -1,107 +1,105 @@
 <?php
 
 namespace App\Console;
 
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Schema;
 
 /**
  * This abstract class provides a means to treat objects in our model using CRUD.
  */
 abstract class ObjectUpdateCommand extends ObjectCommand
 {
     public function __construct()
     {
         $this->description = "Update a {$this->objectName}";
         $this->signature = sprintf(
             "%s%s:update {%s}",
             $this->commandPrefix ? $this->commandPrefix . ":" : "",
             $this->objectName,
             $this->objectName
         );
 
         $class = new $this->objectClass();
 
         try {
             foreach (Schema::getColumnListing($class->getTable()) as $column) {
                 if ($column == "id") {
                     continue;
                 }
 
                 $this->signature .= " {--{$column}=}";
             }
         } catch (\Exception $e) {
             \Log::error("Could not extract options: {$e->getMessage()}");
         }
 
         $classes = class_uses_recursive($this->objectClass);
 
         if (in_array(SoftDeletes::class, $classes)) {
             $this->signature .= " {--with-deleted : Include deleted {$this->objectName}s}";
         }
 
         parent::__construct();
     }
 
     public function getProperties()
     {
         if (!empty($this->properties)) {
             return $this->properties;
         }
 
         $class = new $this->objectClass();
 
         $this->properties = [];
 
         foreach (Schema::getColumnListing($class->getTable()) as $column) {
             if ($column == "id") {
                 continue;
             }
 
             if (($value = $this->option($column)) !== null) {
                 $this->properties[$column] = $value;
             }
         }
 
         return $this->properties;
     }
 
     /**
      * Execute the console command.
      *
      * @return mixed
      */
     public function handle()
     {
         $argument = $this->argument($this->objectName);
 
         $object = $this->getObject($this->objectClass, $argument, $this->objectTitle);
 
         if (!$object) {
             $this->error("No such {$this->objectName} {$argument}");
             return 1;
         }
 
         foreach ($this->getProperties() as $property => $value) {
             if ($property == "deleted_at" && $value == "null") {
                 $value = null;
             }
 
             $object->{$property} = $value;
         }
 
         $object->timestamps = false;
 
         if ($this->commandPrefix == 'scalpel') {
             $this->objectClass::withoutEvents(
                 function () use ($object) {
                     $object->save();
                 }
             );
         } else {
             $object->save();
         }
-
-        $this->cacheRefresh($object);
     }
 }
diff --git a/src/app/Utils.php b/src/app/Utils.php
index f3ed690f..13e8500f 100644
--- a/src/app/Utils.php
+++ b/src/app/Utils.php
@@ -1,575 +1,574 @@
 <?php
 
 namespace App;
 
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Auth;
 use Ramsey\Uuid\Uuid;
-use Illuminate\Support\Facades\Cache;
 
 /**
  * Small utility functions for App.
  */
 class Utils
 {
     // Note: Removed '0', 'O', '1', 'I' as problematic with some fonts
     public const CHARS = '23456789ABCDEFGHJKLMNPQRSTUVWXYZ';
 
     /**
      * Exchange rates for unit tests
      */
     private static $testRates;
 
     /**
      * Count the number of lines in a file.
      *
      * Useful for progress bars.
      *
      * @param string $file The filepath to count the lines of.
      *
      * @return int
      */
     public static function countLines($file)
     {
         $fh = fopen($file, 'rb');
         $numLines = 0;
 
         while (!feof($fh)) {
             $numLines += substr_count(fread($fh, 8192), "\n");
         }
 
         fclose($fh);
 
         return $numLines;
     }
 
     /**
      * Return the country ISO code for an IP address.
      *
      * @return string
      */
     public static function countryForIP($ip)
     {
         if (strpos($ip, ':') === false) {
             $net = \App\IP4Net::getNet($ip);
         } else {
             $net = \App\IP6Net::getNet($ip);
         }
 
         return $net && $net->country ? $net->country : 'CH';
     }
 
     /**
      * Return the country ISO code for the current request.
      */
     public static function countryForRequest()
     {
         $request = \request();
         $ip = $request->ip();
 
         return self::countryForIP($ip);
     }
 
     /**
      * Return the number of days in the month prior to this one.
      *
      * @return int
      */
     public static function daysInLastMonth()
     {
         $start = new Carbon('first day of last month');
         $end = new Carbon('last day of last month');
 
         return $start->diffInDays($end) + 1;
     }
 
     /**
      * Download a file from the interwebz and store it locally.
      *
      * @param string $source The source location
      * @param string $target The target location
      * @param bool $force    Force the download (and overwrite target)
      *
      * @return void
      */
     public static function downloadFile($source, $target, $force = false)
     {
         if (is_file($target) && !$force) {
             return;
         }
 
         \Log::info("Retrieving {$source}");
 
         $fp = fopen($target, 'w');
 
         $curl = curl_init();
         curl_setopt($curl, CURLOPT_URL, $source);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($curl, CURLOPT_FILE, $fp);
         curl_exec($curl);
 
         if (curl_errno($curl)) {
             \Log::error("Request error on {$source}: " . curl_error($curl));
 
             curl_close($curl);
             fclose($fp);
 
             unlink($target);
             return;
         }
 
         curl_close($curl);
         fclose($fp);
     }
 
     /**
      * Converts an email address to lower case. Keeps the LMTP shared folder
      * addresses character case intact.
      *
      * @param string $email Email address
      *
      * @return string Email address
      */
     public static function emailToLower(string $email): string
     {
         // For LMTP shared folder address lower case the domain part only
         if (str_starts_with($email, 'shared+shared/')) {
             $pos = strrpos($email, '@');
             $domain = substr($email, $pos + 1);
             $local = substr($email, 0, strlen($email) - strlen($domain) - 1);
 
             return $local . '@' . strtolower($domain);
         }
 
         return strtolower($email);
     }
 
     /**
      * Generate a passphrase. Not intended for use in production, so limited to environments that are not production.
      *
      * @return string
      */
     public static function generatePassphrase()
     {
         if (\config('app.env') == 'production') {
             throw new \Exception("Thou shall not pass!");
         }
 
         if (\config('app.passphrase')) {
             return \config('app.passphrase');
         }
 
         $alphaLow = 'abcdefghijklmnopqrstuvwxyz';
         $alphaUp = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
         $num = '0123456789';
         $stdSpecial = '~`!@#$%^&*()-_+=[{]}\\|\'";:/?.>,<';
 
         $source = $alphaLow . $alphaUp . $num . $stdSpecial;
 
         $result = '';
 
         for ($x = 0; $x < 16; $x++) {
             $result .= substr($source, rand(0, (strlen($source) - 1)), 1);
         }
 
         return $result;
     }
 
     /**
      * Find an object that is the recipient for the specified address.
      *
      * @param string $address
      *
      * @return array
      */
     public static function findObjectsByRecipientAddress($address)
     {
         $address = \App\Utils::normalizeAddress($address);
 
         list($local, $domainName) = explode('@', $address);
 
         $domain = \App\Domain::where('namespace', $domainName)->first();
 
         if (!$domain) {
             return [];
         }
 
         $user = \App\User::where('email', $address)->first();
 
         if ($user) {
             return [$user];
         }
 
         $userAliases = \App\UserAlias::where('alias', $address)->get();
 
         if (count($userAliases) > 0) {
             $users = [];
 
             foreach ($userAliases as $userAlias) {
                 $users[] = $userAlias->user;
             }
 
             return $users;
         }
 
         $userAliases = \App\UserAlias::where('alias', "catchall@{$domain->namespace}")->get();
 
         if (count($userAliases) > 0) {
             $users = [];
 
             foreach ($userAliases as $userAlias) {
                 $users[] = $userAlias->user;
             }
 
             return $users;
         }
 
         return [];
     }
 
     /**
      * Retrieve the network ID and Type from a client address
      *
      * @param string $clientAddress The IPv4 or IPv6 address.
      *
      * @return array An array of ID and class or null and null.
      */
     public static function getNetFromAddress($clientAddress)
     {
         if (strpos($clientAddress, ':') === false) {
             $net = \App\IP4Net::getNet($clientAddress);
 
             if ($net) {
                 return [$net->id, \App\IP4Net::class];
             }
         } else {
             $net = \App\IP6Net::getNet($clientAddress);
 
             if ($net) {
                 return [$net->id, \App\IP6Net::class];
             }
         }
 
         return [null, null];
     }
 
     /**
      * Calculate the broadcast address provided a net number and a prefix.
      *
      * @param string $net A valid IPv6 network number.
      * @param int $prefix The network prefix.
      *
      * @return string
      */
     public static function ip6Broadcast($net, $prefix)
     {
         $netHex = bin2hex(inet_pton($net));
 
         // Overwriting first address string to make sure notation is optimal
         $net = inet_ntop(hex2bin($netHex));
 
         // Calculate the number of 'flexible' bits
         $flexbits = 128 - $prefix;
 
         // Build the hexadecimal string of the last address
         $lastAddrHex = $netHex;
 
         // We start at the end of the string (which is always 32 characters long)
         $pos = 31;
         while ($flexbits > 0) {
             // Get the character at this position
             $orig = substr($lastAddrHex, $pos, 1);
 
             // Convert it to an integer
             $origval = hexdec($orig);
 
             // OR it with (2^flexbits)-1, with flexbits limited to 4 at a time
             $newval = $origval | (pow(2, min(4, $flexbits)) - 1);
 
             // Convert it back to a hexadecimal character
             $new = dechex($newval);
 
             // And put that character back in the string
             $lastAddrHex = substr_replace($lastAddrHex, $new, $pos, 1);
 
             // We processed one nibble, move to previous position
             $flexbits -= 4;
             $pos -= 1;
         }
 
         // Convert the hexadecimal string to a binary string
         $lastaddrbin = hex2bin($lastAddrHex);
 
         // And create an IPv6 address from the binary string
         $lastaddrstr = inet_ntop($lastaddrbin);
 
         return $lastaddrstr;
     }
 
     /**
      * Normalize an email address.
      *
      * This means to lowercase and strip components separated with recipient delimiters.
      *
      * @param ?string $address The address to normalize
      * @param bool    $asArray Return an array with local and domain part
      *
      * @return string|array Normalized email address as string or array
      */
     public static function normalizeAddress(?string $address, bool $asArray = false)
     {
         if ($address === null || $address === '') {
             return $asArray ? ['', ''] : '';
         }
 
         $address = self::emailToLower($address);
 
         if (strpos($address, '@') === false) {
             return $asArray ? [$address, ''] : $address;
         }
 
         list($local, $domain) = explode('@', $address);
 
         if (strpos($local, '+') !== false) {
             $local = explode('+', $local)[0];
         }
 
         return $asArray ? [$local, $domain] : "{$local}@{$domain}";
     }
 
     /**
      * Provide all unique combinations of elements in $input, with order and duplicates irrelevant.
      *
      * @param array $input The input array of elements.
      *
      * @return array[]
      */
     public static function powerSet(array $input): array
     {
         $output = [];
 
         for ($x = 0; $x < count($input); $x++) {
             self::combine($input, $x + 1, 0, [], 0, $output);
         }
 
         return $output;
     }
 
     /**
      * Returns the current user's email address or null.
      *
      * @return string
      */
     public static function userEmailOrNull(): ?string
     {
         $user = Auth::user();
 
         if (!$user) {
             return null;
         }
 
         return $user->email;
     }
 
     /**
      * Returns a random string consisting of a quantity of segments of a certain length joined.
      *
      * Example:
      *
      * ```php
      * $roomName = strtolower(\App\Utils::randStr(3, 3, '-');
      * // $roomName == '3qb-7cs-cjj'
      * ```
      *
      * @param int $length  The length of each segment
      * @param int $qty     The quantity of segments
      * @param string $join The string to use to join the segments
      *
      * @return string
      */
     public static function randStr($length, $qty = 1, $join = '')
     {
         $chars = env('SHORTCODE_CHARS', self::CHARS);
 
         $randStrs = [];
 
         for ($x = 0; $x < $qty; $x++) {
             $randStrs[$x] = [];
 
             for ($y = 0; $y < $length; $y++) {
                 $randStrs[$x][] = $chars[rand(0, strlen($chars) - 1)];
             }
 
             shuffle($randStrs[$x]);
 
             $randStrs[$x] = implode('', $randStrs[$x]);
         }
 
         return implode($join, $randStrs);
     }
 
     /**
      * Returns a UUID in the form of an integer.
      *
      * @return integer
      */
     public static function uuidInt(): int
     {
         $hex = Uuid::uuid4();
         $bin = pack('h*', str_replace('-', '', $hex));
         $ids = unpack('L', $bin);
         $id = array_shift($ids);
 
         return $id;
     }
 
     /**
      * Returns a UUID in the form of a string.
      *
      * @return string
      */
     public static function uuidStr(): string
     {
         return Uuid::uuid4()->toString();
     }
 
     private static function combine($input, $r, $index, $data, $i, &$output): void
     {
         $n = count($input);
 
         // Current cobination is ready
         if ($index == $r) {
             $output[] = array_slice($data, 0, $r);
             return;
         }
 
         // When no more elements are there to put in data[]
         if ($i >= $n) {
             return;
         }
 
         // current is included, put next at next location
         $data[$index] = $input[$i];
         self::combine($input, $r, $index + 1, $data, $i + 1, $output);
 
         // current is excluded, replace it with next (Note that i+1
         // is passed, but index is not changed)
         self::combine($input, $r, $index, $data, $i + 1, $output);
     }
 
     /**
      * Create self URL
      *
      * @param string   $route    Route/Path/URL
      * @param int|null $tenantId Current tenant
      *
      * @todo Move this to App\Http\Controllers\Controller
      *
      * @return string Full URL
      */
     public static function serviceUrl(string $route, $tenantId = null): string
     {
         if (preg_match('|^https?://|i', $route)) {
             return $route;
         }
 
         $url = \App\Tenant::getConfig($tenantId, 'app.public_url');
 
         if (!$url) {
             $url = \App\Tenant::getConfig($tenantId, 'app.url');
         }
 
         return rtrim(trim($url, '/') . '/' . ltrim($route, '/'), '/');
     }
 
     /**
      * Create a configuration/environment data to be passed to
      * the UI
      *
      * @todo Move this to App\Http\Controllers\Controller
      *
      * @return array Configuration data
      */
     public static function uiEnv(): array
     {
         $countries = include resource_path('countries.php');
         $req_domain = preg_replace('/:[0-9]+$/', '', request()->getHttpHost());
         $sys_domain = \config('app.domain');
         $opts = [
             'app.name',
             'app.url',
             'app.domain',
             'app.theme',
             'app.webmail_url',
             'app.support_email',
             'mail.from.address'
         ];
 
         $env = \app('config')->getMany($opts);
 
         $env['countries'] = $countries ?: [];
         $env['view'] = 'root';
         $env['jsapp'] = 'user.js';
 
         if ($req_domain == "admin.$sys_domain") {
             $env['jsapp'] = 'admin.js';
         } elseif ($req_domain == "reseller.$sys_domain") {
             $env['jsapp'] = 'reseller.js';
         }
 
         $env['paymentProvider'] = \config('services.payment_provider');
         $env['stripePK'] = \config('services.stripe.public_key');
 
         $env['languages'] = \App\Http\Controllers\ContentController::locales();
         $env['menu'] = \App\Http\Controllers\ContentController::menu();
 
         return $env;
     }
 
     /**
      * Set test exchange rates.
      *
      * @param array       $rates: Exchange rates
      */
     public static function setTestExchangeRates(array $rates): void
     {
         self::$testRates = $rates;
     }
 
     /**
      * Retrieve an exchange rate.
      *
      * @param string       $sourceCurrency: Currency from which to convert
      * @param string       $targetCurrency: Currency to convert to
      *
      * @return float Exchange rate
      */
     public static function exchangeRate(string $sourceCurrency, string $targetCurrency): float
     {
         if (strcasecmp($sourceCurrency, $targetCurrency) == 0) {
             return 1.0;
         }
 
         if (isset(self::$testRates[$targetCurrency])) {
             return floatval(self::$testRates[$targetCurrency]);
         }
 
         $currencyFile = resource_path("exchangerates-$sourceCurrency.php");
 
         //Attempt to find the reverse exchange rate, if we don't have the file for the source currency
         if (!file_exists($currencyFile)) {
             $rates = include resource_path("exchangerates-$targetCurrency.php");
             if (!isset($rates[$sourceCurrency])) {
                 throw new \Exception("Failed to find the reverse exchange rate for " . $sourceCurrency);
             }
             return 1.0 / floatval($rates[$sourceCurrency]);
         }
 
         $rates = include $currencyFile;
         if (!isset($rates[$targetCurrency])) {
             throw new \Exception("Failed to find exchange rate for " . $targetCurrency);
         }
 
         return floatval($rates[$targetCurrency]);
     }
 }