Initial work on store tokens cache