user cache
Merge remote-tracking branch 'upstream/master'
Merge pull request #478 from patriot1burke/master

user cache