Fix container resolution of default values for non-scalar dependencies.
Merging 4.0 Updating cache composer file.