phpdoc fixes
Remove unused local vars in Cache
As reported by phpstorm. This should fix them.
fixed permission change.
Fixes #5601
Merge pull request #5610
Merge pull request #5610 in master
Merge pull request #5589
Merge pull request #5589 in master
Merge pull request #5574
Merge pull request #5574 in master
Merge commit '9ff45735c699dde3d5f4b719e0b01c00c855c0e9'