Merge pull request #460 from patriot1burke/master

refactor for caching
Merge pull request #461 from patriot1burke/master

caching
better fetch for role mappings