added cache handlers for tokens