Add tokens to cache automatically whenever requested from service.
Combine paths correctly, avoid double /
Test user renamed.