Use a cache for PHP-DI
Fixed formatting to make definitions readable
Merge pull request #11 from mnapoli/php-di-fixes

PHP-DI's test now uses a cache