New token cache model

Fixed.