Order fields
Extract PersistentCache