diff --git a/app/config/environment.php b/app/config/environment.php
new file mode 100644
index 00000000000..3d144d06a2e
--- /dev/null
+++ b/app/config/environment.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+    'debug'            => false,
+    'env'              => 'prod', //dev
+    'dev_ip_whitelist' => [
+        '127.0.0.1',
+        '::1',
+        '172.17.0.1',
+    ],
+];
diff --git a/index.php b/index.php
index 514eb32d6a6..a2a219797e4 100644
--- a/index.php
+++ b/index.php
@@ -6,14 +6,24 @@
 date_default_timezone_set('UTC');
 
 require_once 'autoload.php';
+$config = include 'app/config/environment.php';
 
 use Mautic\CoreBundle\ErrorHandler\ErrorHandler;
 use Mautic\Middleware\MiddlewareBuilder;
 use Symfony\Component\HttpFoundation\Request;
 
-ErrorHandler::register('prod');
+//ErrorHandler::register('prod');
+ErrorHandler::register($config['env']);
 
-$kernel   = (new MiddlewareBuilder(new AppKernel('prod', false)))->resolve();
+if (
+    'dev' === strtolower($config['env'])
+    && extension_loaded('apcu')
+    && in_array(@$_SERVER['REMOTE_ADDR'], $config['dev_ip_whitelist'])
+) {
+    @apcu_clear_cache();
+}
+
+$kernel   = (new MiddlewareBuilder(new AppKernel($config['env'], $config['debug'])))->resolve();
 $request  = Request::createFromGlobals();
 $response = $kernel->handle($request);
 $response->send();