Remove manual setting of the Z cache file
Fix git branch not changing bug