Merge "Revert "Enable keystone token caching by OSC""