CM improve ProxyEntity's thread safety