fix reporter
token cache services
small fix