Removed Shiro's caching to get dynamic updates
Merge remote-tracking branch 'origin/master'