Fix caching issue in PropertySQLLookup

Change-Id: If26f0d5a80a3af1f61c7a6c9951e15a8c38e37f4
Merge "Fix caching issue in PropertySQLLookup"