Remove caching code, minor changes in Bootstrap.php