Before, the field data was getting cached incorrectly in that
it was accessing the cached data set and field data when it
only should have been accessing the cached data set but
current point data.

Change-Id: Ic15f84541ac98303d5526c81d1341e2cc589ca88