DEVELOPER-1118 Connectors query done on every page load