Explicitly pass old json snippet to update

Don't use state cached in the resource.

Change-Id: Ib6c7830ce40b72c9cd388c054fcb41ff93963b4d
Get rid of template caching in resources

This is no longer used anywhere.

Change-Id: I3b320a1668f5ba532b01b289222a56126c19c8aa
Merge "Explicitly pass old json snippet to update"
Merge "Get rid of template caching in resources"