Remove unused local vars in Cache
As reported by phpstorm. This should fix them.
fixed permission change.
Merge pull request #5610 in master
Merge pull request #5589
Merge pull request #5589 in develop