DFP Data Caching Improvement: Part 2

This separates reading custom fields out of other DFP-data reading.

Follows on from #7499