Fix handling of optional asset fields cache