Add property-invalidated cache am: 764ff47f87

Change-Id: I49849de310a637d9d407698a4a0120b5b8aa48aa