Revert "add discard to cache and data"

This reverts commit 0bd358a5656bd669e7c501ee3c2ce6ac0795b0ec.

Change-Id: Ib65bcda3336f28ff14e4e5b468395ed5b431cf0b