Updated cache timestamp logic to work with MapDataStore

Signed-off-by: mvglasow <michael -at- vonglasow.com>