Updated/New Composer support for Cache

See diff for full changes