modified:   Cache.php
Merge branch 'master' into namespace