Merge "ComposerClient 2.4: Clean cache on hotplug" into sc-dev