Fix lexer and parser build cache misses

Fix lexer and parser build cache misses #1473