Fix permissions cache system
Merge remote-tracking branch 'origin/master' into users