Avoid parser cache miss that often occurs post-save