Improved performance for entityProvider