Revert "Modify DataStoreCahce to hold additional information"

This reverts commit 3dc9d03e166f641c926517fa37be5cf9d0bba83c.
Working on fix