Minor cleanup, remove frame expansion caching

Frame expansion caching does not matter any more as we are not expanding
complex templates natively. Even in parser tests it did not make any
difference to the run time. So better to simplify things.

Change-Id: I70381d46dff2cc9ff3304b98959025c43f411ed7
Merge "Minor cleanup, remove frame expansion caching"