Fix to fetch to include version when needed. Fix to persist of
Map<NonPC,NonPC>