Merge "Added a --cache option to mctest.php and mcc.php."