Small simplification
Remove undocumented & unused preparser cache. Since it didn't have any
way of invalidating entries, it woudn't have worked anyways
Small simplification
CS fix