Cache disk name and number for correct ordering

Ticket:	#3229