#210 Merge cache.php and cache_toolbar.php