Added config duplicate check & cache regeneration