Adding locking around logic that builds bean properties