Fix cache handling
Fix composer.json