Add property cache support.
Minor comment cleanup.
Minor comment cleanup.