removed property caching due to issues