diff --git a/www/admin/adminFeedback.php b/www/admin/adminFeedback.php
index 4f98845086..455a3795cd 100644
--- a/www/admin/adminFeedback.php
+++ b/www/admin/adminFeedback.php
@@ -15,11 +15,11 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
-phrasea::headers(200, false, 'text/html', 'UTF-8', false);
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 
 $request = http_request::getInstance();
-$appbox = appbox::get_instance();
 $registry = $appbox->get_registry();
 $parm = $request->get_parms('action', 'position', 'test', 'renew', 'path', 'tests');
 
diff --git a/www/admin/cgus.php b/www/admin/cgus.php
index 58c2f1ed5d..49c7570c56 100644
--- a/www/admin/cgus.php
+++ b/www/admin/cgus.php
@@ -14,9 +14,9 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
-
-$appbox = appbox::get_instance();
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 $session = $appbox->get_session();
 $registry = $appbox->get_registry();
 $request = http_request::getInstance();
diff --git a/www/admin/collection.php b/www/admin/collection.php
index 3451e712fc..2896a7c152 100644
--- a/www/admin/collection.php
+++ b/www/admin/collection.php
@@ -14,9 +14,9 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
-
-$appbox = appbox::get_instance();
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 $session = $appbox->get_session();
 $registry = $appbox->get_registry();
 
diff --git a/www/admin/collorder.php b/www/admin/collorder.php
index 15a35f7430..262c6f183f 100644
--- a/www/admin/collorder.php
+++ b/www/admin/collorder.php
@@ -14,9 +14,9 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
-
-$appbox = appbox::get_instance();
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 $session = $appbox->get_session();
 
 $request = http_request::getInstance();
diff --git a/www/admin/database.php b/www/admin/database.php
index 64c590f868..a88093e4ef 100644
--- a/www/admin/database.php
+++ b/www/admin/database.php
@@ -14,9 +14,9 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
-
-$appbox = appbox::get_instance();
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 $session = $appbox->get_session();
 $registry = $appbox->get_registry();
 $request = http_request::getInstance();
diff --git a/www/admin/databases.php b/www/admin/databases.php
index bf6bc8d1bb..740ee2a4da 100644
--- a/www/admin/databases.php
+++ b/www/admin/databases.php
@@ -14,8 +14,9 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
-$appbox = appbox::get_instance();
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 $session = $appbox->get_session();
 $usr_id = $session->get_usr_id();
 $registry = $appbox->get_registry();
@@ -53,7 +54,7 @@ phrasea::headers();
         $checks = phrasea::is_scheduler_started();
         if ($checks !== true)
         {
-          $appbox = appbox::get_instance();
+          $appbox = appbox::get_instance(\bootstrap::getCore());
           $upgrader = new Setup_Upgrade($appbox);
           $advices = $appbox->forceUpgrade($upgrader);
 
@@ -116,7 +117,7 @@ phrasea::headers();
 
               $data_template = new system_file($registry->get('GV_RootPath') . 'lib/conf.d/data_templates/' . $parm['new_data_template'] . '.xml');
 
-              $connbas = new connection_pdo('databox_creation', $hostname, $port, $user, $password, $parm['new_dbname']);
+              $connbas = new connection_pdo('databox_creation', $hostname, $port, $user, $password, $parm['new_dbname'], array(), $appbox->get_registry());
 
               try
               {
@@ -151,7 +152,7 @@ phrasea::headers();
             try
             {
               $data_template = new system_file($registry->get('GV_RootPath') . 'lib/conf.d/data_templates/' . $parm['new_data_template'] . '.xml');
-              $connbas = new connection_pdo('databox_creation', $parm['new_hostname'], $parm['new_port'], $parm['new_user'], $parm['new_password'], $parm['new_dbname']);
+              $connbas = new connection_pdo('databox_creation', $parm['new_hostname'], $parm['new_port'], $parm['new_user'], $parm['new_password'], $parm['new_dbname'], array(), $appbox->get_registry());
               $base = databox::create($appbox, $connbas, $data_template, $registry);
               $base->registerAdmin($user_obj);
               $createBase = $sbas_id = $base->get_sbas_id();
diff --git a/www/admin/demand.php b/www/admin/demand.php
index 2a24745cd4..0e88ac3e5d 100644
--- a/www/admin/demand.php
+++ b/www/admin/demand.php
@@ -15,9 +15,9 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
-
-$appbox = appbox::get_instance();
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 $session = $appbox->get_session();
 
 $request = http_request::getInstance();
diff --git a/www/admin/getinfousr.php b/www/admin/getinfousr.php
index 25f5c47e49..424976c024 100644
--- a/www/admin/getinfousr.php
+++ b/www/admin/getinfousr.php
@@ -14,11 +14,13 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 
 $request = http_request::getInstance();
 $parm = $request->get_parms("u");
-$appbox = appbox::get_instance();
+$appbox = appbox::get_instance(\bootstrap::getCore());
 $user = User_Adapter::getInstance($parm['u'], $appbox);
 
 phrasea::headers();
diff --git a/www/admin/global_values.php b/www/admin/global_values.php
index f5417c1f85..5968817892 100644
--- a/www/admin/global_values.php
+++ b/www/admin/global_values.php
@@ -14,8 +14,9 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once("../../lib/bootstrap.php");
-$appbox = appbox::get_instance();
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 $session = $appbox->get_session();
 $registry = $appbox->get_registry();
 require($registry->get('GV_RootPath') . "lib/classes/deprecated/countries.php");
diff --git a/www/admin/import.php b/www/admin/import.php
index f6abfb9ffc..9ead51f473 100644
--- a/www/admin/import.php
+++ b/www/admin/import.php
@@ -15,8 +15,9 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
-$appbox = appbox::get_instance();
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 $session = $appbox->get_session();
 
 $usr_id = $session->get_usr_id();
diff --git a/www/admin/import0.php b/www/admin/import0.php
index 65fed1c210..92a2ca9434 100644
--- a/www/admin/import0.php
+++ b/www/admin/import0.php
@@ -15,8 +15,9 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
-$appbox = appbox::get_instance();
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 $session = $appbox->get_session();
 
 phrasea::headers();
diff --git a/www/admin/newcoll.php b/www/admin/newcoll.php
index 5d3389ac51..f407c12326 100644
--- a/www/admin/newcoll.php
+++ b/www/admin/newcoll.php
@@ -14,9 +14,10 @@
  * @package
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
- */
-require_once __DIR__ . "/../../lib/bootstrap.php";
-$appbox = appbox::get_instance();
+
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 $session = $appbox->get_session();
 
 $request = http_request::getInstance();
diff --git a/www/admin/runscheduler.php b/www/admin/runscheduler.php
index e7805ac553..3d6f55ad96 100644
--- a/www/admin/runscheduler.php
+++ b/www/admin/runscheduler.php
@@ -15,9 +15,9 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
-
-$appbox = appbox::get_instance();
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 $session = $appbox->get_session();
 $registry = $appbox->get_registry();
 $request = http_request::getInstance();
diff --git a/www/admin/sessionwhois.php b/www/admin/sessionwhois.php
index 1afa3964f7..bcd4625e8d 100644
--- a/www/admin/sessionwhois.php
+++ b/www/admin/sessionwhois.php
@@ -15,8 +15,9 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
-$appbox = appbox::get_instance();
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 $session = $appbox->get_session();
 ?>
 <style type="text/css">
diff --git a/www/admin/showlogtask.php b/www/admin/showlogtask.php
index fbb0d4b8a3..a5da51940d 100644
--- a/www/admin/showlogtask.php
+++ b/www/admin/showlogtask.php
@@ -15,8 +15,9 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
-$appbox = appbox::get_instance();
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 $session = $appbox->get_session();
 
 $request = http_request::getInstance();
diff --git a/www/admin/sitestruct.php b/www/admin/sitestruct.php
index 596b9663ab..769dce407e 100644
--- a/www/admin/sitestruct.php
+++ b/www/admin/sitestruct.php
@@ -15,9 +15,9 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
-
-$appbox = appbox::get_instance();
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 $session = $appbox->get_session();
 $registry = $appbox->get_registry();
 
@@ -37,15 +37,11 @@ if (!$user->is_admin())
 
 
 $cache_flushed = false;
-if ($parm['flush_cache'] && $registry->get('GV_cache_server_type') !== 'nocache')
+if ($parm['flush_cache'])
 {
-  $cache = $appbox->get_cache()->flush();
-
-  if ($cache->ping())
-  {
-    if ($cache->flush() === true)
-      $cache_flushed = true;
-  }
+  $Core = \bootstrap::getCore();
+  $Core['CacheService']->flushAll();
+  $cache_flushed = true;
 }
 ?>
 <html lang="<?php echo $session->get_I18n(); ?>">
@@ -318,19 +314,14 @@ if ($parm['flush_cache'] && $registry->get('GV_cache_server_type') !== 'nocache'
           setup::check_cache_opcode();
           setup::check_cache_memcache();
 
-          if ($registry->get('GV_cache_server_type') !== 'nocache')
+          if ($Core->getCache()->isServer())
           {
-            $cache = cache_adapter::get_instance($registry);
-
-            if ($cache->ping())
-            {
         ?>
               <form method="post" action="sitestruct.php">
                 <input type="hidden" name="flush_cache" value="1"/>
                 <input type="submit" value="Flush Memcached"/>
               </form>
 <?php
-            }
           }
 ?>
         <?php
diff --git a/www/admin/statbits.php b/www/admin/statbits.php
index 86ab9742d1..2337b1f978 100644
--- a/www/admin/statbits.php
+++ b/www/admin/statbits.php
@@ -15,9 +15,9 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
-
-$appbox = appbox::get_instance();
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 $session = $appbox->get_session();
 
 $request = http_request::getInstance();
diff --git a/www/admin/structure.php b/www/admin/structure.php
index f3db7c10ed..7c146353da 100644
--- a/www/admin/structure.php
+++ b/www/admin/structure.php
@@ -15,8 +15,9 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
-$appbox = appbox::get_instance();
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 $session = $appbox->get_session();
 
 $request = http_request::getInstance();
diff --git a/www/admin/sugval.php b/www/admin/sugval.php
index 6d34e04a8e..e0c522cdb2 100644
--- a/www/admin/sugval.php
+++ b/www/admin/sugval.php
@@ -14,8 +14,9 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
-$appbox = appbox::get_instance();
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 $session = $appbox->get_session();
 
 $request = http_request::getInstance();
diff --git a/www/admin/task2.php b/www/admin/task2.php
index f5eff4924d..2cc2a8088f 100644
--- a/www/admin/task2.php
+++ b/www/admin/task2.php
@@ -14,9 +14,9 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
-$appbox = appbox::get_instance();
-$session = $appbox->get_session();
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 
 $request = http_request::getInstance();
 $parm = $request->get_parms('act'  // NEWTASK or SAVETASK
diff --git a/www/admin/task2utils.php b/www/admin/task2utils.php
index 60ca29801c..abcba7d51b 100644
--- a/www/admin/task2utils.php
+++ b/www/admin/task2utils.php
@@ -14,9 +14,9 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
-
-$appbox = appbox::get_instance();
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 $session = $appbox->get_session();
 
 $request = http_request::getInstance();
diff --git a/www/admin/taskmanager.php b/www/admin/taskmanager.php
index b18ec4b7af..617e0030a5 100644
--- a/www/admin/taskmanager.php
+++ b/www/admin/taskmanager.php
@@ -14,8 +14,10 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
-$appbox = appbox::get_instance();
+
+/* @var $Core \Alchemy\Phrasea\Core */
+$Core = require_once __DIR__ . "/../../lib/bootstrap.php";
+$appbox = appbox::get_instance($Core);
 $session = $appbox->get_session();
 
 $request = http_request::getInstance();