Cleaned up issues with git cache