Merge change 24376 into eclair

* changes:
  Query for all properties if a property change is received and cache is empty.