Merge branch 'composer-cache'