Merge "Reduce chance for parser cache race conditions"