Updates to make property cache work