Try to fix timing issues with the CachingGitDataStore