Merge pull request #15 from md-systems/8.x-1.x

Clean-up, Merge 7.x-1.x, Fixing tests
Fix TokenCacheController