New token cache model

iOS seems to be still on the old model (userId and the flag IsDisplayableId). I assume iOS needs to move to the new model.