Migrate {apt,composer}-cache/* to cache/{apt,composer}/*

It's a bit neater that way.

Change-Id: If429ae1b2becc24ed53d46cc509a1ba6a739c1ca