Add property-invalidated cache am: 764ff47f87 am: 7c9f1499bc

Change-Id: Ib917ce8f32bccf91ec2c4d77e445f8afae6d7ad5