Fix config merge when cached