Use parser cache

Change-Id: I5a7426ee2bc3b7cbe0e98fd3b846127f5cacef28
Merge "Use parser cache"