Fixed issue with cache for child properties being out-of-date.

Change-Id: I08e3c050627699095bf2ce520c0dcc6b8b21cfdc