diff --git a/server/modules/filter/cache/cachefilter.cc b/server/modules/filter/cache/cachefilter.cc
index 8f86ee50c..81ab07469 100644
--- a/server/modules/filter/cache/cachefilter.cc
+++ b/server/modules/filter/cache/cachefilter.cc
@@ -350,7 +350,7 @@ bool CacheFilter::process_params(MXS_CONFIG_PARAMETER* ppParams, CACHE_CONFIG& c
     config.soft_ttl = ppParams->get_integer("soft_ttl");
     config.max_size = ppParams->get_size("max_size");
     config.max_count = ppParams->get_integer("max_count");
-    config.storage = MXS_STRDUP(config_get_string(ppParams, "storage"));
+    config.storage = ppParams->get_c_str_copy("storage");
     config.max_resultset_rows = ppParams->get_integer("max_resultset_rows");
     config.max_resultset_size = ppParams->get_size("max_resultset_size");
     config.thread_model = static_cast<cache_thread_model_t>(ppParams->get_enum("cached_data",
diff --git a/server/modules/filter/ccrfilter/ccrfilter.cc b/server/modules/filter/ccrfilter/ccrfilter.cc
index eeda95e27..4666f3f66 100644
--- a/server/modules/filter/ccrfilter/ccrfilter.cc
+++ b/server/modules/filter/ccrfilter/ccrfilter.cc
@@ -91,8 +91,8 @@ public:
         {
             new_instance->m_count = params->get_integer("count");
             new_instance->m_time = params->get_integer("time");
-            new_instance->m_match = config_get_string(params, PARAM_MATCH);
-            new_instance->m_nomatch = config_get_string(params, PARAM_IGNORE);
+            new_instance->m_match = params->get_string(PARAM_MATCH);
+            new_instance->m_nomatch = params->get_string(PARAM_IGNORE);
 
             int cflags = params->get_enum("options", option_values);
             const char* keys[] = {PARAM_MATCH, PARAM_IGNORE};
diff --git a/server/modules/filter/comment/commentfilter.cc b/server/modules/filter/comment/commentfilter.cc
index e88bbce99..eb5dc1a67 100644
--- a/server/modules/filter/comment/commentfilter.cc
+++ b/server/modules/filter/comment/commentfilter.cc
@@ -62,7 +62,7 @@ CommentFilter::~CommentFilter()
 // static
 CommentFilter* CommentFilter::create(const char* zName, MXS_CONFIG_PARAMETER* pParams)
 {
-    return new CommentFilter(config_get_string(pParams, CN_INJECT));
+    return new CommentFilter(pParams->get_string(CN_INJECT));
 }
 
 CommentFilterSession* CommentFilter::newSession(MXS_SESSION* pSession)
diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.cc b/server/modules/filter/dbfwfilter/dbfwfilter.cc
index 338060cba..a7d19ed94 100644
--- a/server/modules/filter/dbfwfilter/dbfwfilter.cc
+++ b/server/modules/filter/dbfwfilter/dbfwfilter.cc
@@ -1199,7 +1199,7 @@ int global_version = 1;
 Dbfw::Dbfw(MXS_CONFIG_PARAMETER* params)
     : m_action((enum fw_actions)params->get_enum("action", action_values))
     , m_log_match(0)
-    , m_filename(config_get_string(params, "rules"))
+    , m_filename(params->get_string("rules"))
     , m_version(atomic_add(&global_version, 1))
 {
     if (params->get_bool("log_match"))
@@ -1222,7 +1222,7 @@ Dbfw* Dbfw::create(const char* zName, MXS_CONFIG_PARAMETER* pParams)
     Dbfw* rval = NULL;
     RuleList rules;
     UserMap users;
-    std::string file = config_get_string(pParams, "rules");
+    std::string file = pParams->get_string("rules");
 
     if (process_rule_file(file, &rules, &users))
     {
diff --git a/server/modules/filter/masking/maskingfilterconfig.cc b/server/modules/filter/masking/maskingfilterconfig.cc
index 868c40e30..f004103aa 100644
--- a/server/modules/filter/masking/maskingfilterconfig.cc
+++ b/server/modules/filter/masking/maskingfilterconfig.cc
@@ -99,7 +99,7 @@ MaskingFilterConfig::large_payload_t MaskingFilterConfig::get_large_payload(
 // static
 std::string MaskingFilterConfig::get_rules(const MXS_CONFIG_PARAMETER* pParams)
 {
-    return config_get_string(pParams, rules_name);
+    return pParams->get_string(rules_name);
 }
 
 // static
diff --git a/server/modules/filter/mqfilter/mqfilter.cc b/server/modules/filter/mqfilter/mqfilter.cc
index 479ba72dd..95a5432f7 100644
--- a/server/modules/filter/mqfilter/mqfilter.cc
+++ b/server/modules/filter/mqfilter/mqfilter.cc
@@ -588,13 +588,13 @@ static MXS_FILTER* createInstance(const char* name, MXS_CONFIG_PARAMETER* params
             static_cast<log_trigger_t>(params->get_enum("logging_trigger", trigger_values));
         my_instance->log_all = params->get_bool("logging_log_all");
         my_instance->strict_logging = params->get_bool("logging_strict");
-        my_instance->hostname = MXS_STRDUP_A(config_get_string(params, "hostname"));
-        my_instance->username = MXS_STRDUP_A(config_get_string(params, "username"));
-        my_instance->password = MXS_STRDUP_A(config_get_string(params, "password"));
-        my_instance->vhost = MXS_STRDUP_A(config_get_string(params, "vhost"));
-        my_instance->exchange = MXS_STRDUP_A(config_get_string(params, "exchange"));
-        my_instance->key = MXS_STRDUP_A(config_get_string(params, "key"));
-        my_instance->exchange_type = MXS_STRDUP_A(config_get_string(params, "exchange_type"));
+        my_instance->hostname = params->get_c_str_copy("hostname");
+        my_instance->username = params->get_c_str_copy("username");
+        my_instance->password = params->get_c_str_copy("password");
+        my_instance->vhost = params->get_c_str_copy("vhost");
+        my_instance->exchange = params->get_c_str_copy("exchange");
+        my_instance->key = params->get_c_str_copy("key");
+        my_instance->exchange_type = params->get_c_str_copy("exchange_type");
         my_instance->queue = params->get_c_str_copy("queue");
         my_instance->ssl_client_cert = params->get_c_str_copy("ssl_client_certificate");
         my_instance->ssl_client_key = params->get_c_str_copy("ssl_client_key");
diff --git a/server/modules/filter/namedserverfilter/namedserverfilter.cc b/server/modules/filter/namedserverfilter/namedserverfilter.cc
index 370014570..56a9f174e 100644
--- a/server/modules/filter/namedserverfilter/namedserverfilter.cc
+++ b/server/modules/filter/namedserverfilter/namedserverfilter.cc
@@ -259,8 +259,8 @@ RegexHintFilter* RegexHintFilter::create(const char* name, MXS_CONFIG_PARAMETER*
 
     int pcre_ops = params->get_enum("options", option_values);
 
-    std::string match_val_legacy(config_get_string(params, MATCH_STR));
-    std::string server_val_legacy(config_get_string(params, SERVER_STR));
+    std::string match_val_legacy = params->get_string(MATCH_STR);
+    std::string server_val_legacy = params->get_string(SERVER_STR);
     const bool legacy_mode = (match_val_legacy.length() || server_val_legacy.length());
 
     if (legacy_mode && (!match_val_legacy.length() || !server_val_legacy.length()))
@@ -313,7 +313,7 @@ RegexHintFilter* RegexHintFilter::create(const char* name, MXS_CONFIG_PARAMETER*
     else
     {
         RegexHintFilter* instance = NULL;
-        std::string user(config_get_string(params, "user"));
+        std::string user = params->get_string("user");
         MXS_EXCEPTION_GUARD(instance =
                                 new RegexHintFilter(user,
                                                     source_addresses,
@@ -630,22 +630,22 @@ void RegexHintFilter::form_regex_server_mapping(MXS_CONFIG_PARAMETER* params,
      * only done once. */
     for (unsigned int i = 0; i < param_names_match_indexed.size(); i++)
     {
-        const char* param_name_match = param_names_match_indexed[i].c_str();
-        const char* param_name_target = param_names_target_indexed[i].c_str();
-        std::string match(config_get_string(params, param_name_match));
-        std::string target(config_get_string(params, param_name_target));
+        std::string param_name_match = param_names_match_indexed[i];
+        std::string param_name_target = param_names_target_indexed[i];
+        std::string match = params->get_string(param_name_match);
+        std::string target = params->get_string(param_name_target);
 
         /* Check that both the regex and server config parameters are found */
         if (match.length() < 1 || target.length() < 1)
         {
             if (match.length() > 0)
             {
-                MXS_ERROR("No server defined for regex setting '%s'.", param_name_match);
+                MXS_ERROR("No server defined for regex setting '%s'.", param_name_match.c_str());
                 error = true;
             }
             else if (target.length() > 0)
             {
-                MXS_ERROR("No regex defined for server setting '%s'.", param_name_target);
+                MXS_ERROR("No regex defined for server setting '%s'.", param_name_target.c_str());
                 error = true;
             }
             continue;
diff --git a/server/modules/filter/qlafilter/qlafilter.cc b/server/modules/filter/qlafilter/qlafilter.cc
index 5f669f50c..1e4d9225f 100644
--- a/server/modules/filter/qlafilter/qlafilter.cc
+++ b/server/modules/filter/qlafilter/qlafilter.cc
@@ -228,17 +228,17 @@ QlaInstance::QlaInstance(const char* name, MXS_CONFIG_PARAMETER* params)
     : name(name)
     , log_mode_flags(params->get_enum(PARAM_LOG_TYPE, log_type_values))
     , log_file_data_flags(params->get_enum(PARAM_LOG_DATA, log_data_values))
-    , filebase(config_get_string(params, PARAM_FILEBASE))
+    , filebase(params->get_string(PARAM_FILEBASE))
     , unified_fp(NULL)
     , flush_writes(params->get_bool(PARAM_FLUSH))
     , append(params->get_bool(PARAM_APPEND))
-    , query_newline(config_get_string(params, PARAM_NEWLINE))
-    , separator(config_get_string(params, PARAM_SEPARATOR))
+    , query_newline(params->get_string(PARAM_NEWLINE))
+    , separator(params->get_string(PARAM_SEPARATOR))
     , write_warning_given(false)
-    , user_name(config_get_string(params, PARAM_USER))
-    , source(config_get_string(params, PARAM_SOURCE))
-    , match(config_get_string(params, PARAM_MATCH))
-    , exclude(config_get_string(params, PARAM_EXCLUDE))
+    , user_name(params->get_string(PARAM_USER))
+    , source(params->get_string(PARAM_SOURCE))
+    , match(params->get_string(PARAM_MATCH))
+    , exclude(params->get_string(PARAM_EXCLUDE))
     , re_match(NULL)
     , re_exclude(NULL)
     , ovec_size(0)
diff --git a/server/modules/filter/regexfilter/regexfilter.cc b/server/modules/filter/regexfilter/regexfilter.cc
index 2e7c2c10f..5b03de3c1 100644
--- a/server/modules/filter/regexfilter/regexfilter.cc
+++ b/server/modules/filter/regexfilter/regexfilter.cc
@@ -206,8 +206,8 @@ static MXS_FILTER* createInstance(const char* name, MXS_CONFIG_PARAMETER* params
 
     if (my_instance)
     {
-        my_instance->match = MXS_STRDUP_A(config_get_string(params, "match"));
-        my_instance->replace = MXS_STRDUP_A(config_get_string(params, "replace"));
+        my_instance->match = params->get_c_str_copy("match");
+        my_instance->replace = params->get_c_str_copy("replace");
         my_instance->source = params->get_c_str_copy("source");
         my_instance->user = params->get_c_str_copy("user");
         my_instance->log_trace = params->get_bool("log_trace");
diff --git a/server/modules/filter/topfilter/topfilter.cc b/server/modules/filter/topfilter/topfilter.cc
index 2beeeecb6..2521abdbf 100644
--- a/server/modules/filter/topfilter/topfilter.cc
+++ b/server/modules/filter/topfilter/topfilter.cc
@@ -217,7 +217,7 @@ static MXS_FILTER* createInstance(const char* name, MXS_CONFIG_PARAMETER* params
         my_instance->exclude = params->get_c_str_copy("exclude");
         my_instance->source = params->get_c_str_copy("source");
         my_instance->user = params->get_c_str_copy("user");
-        my_instance->filebase = MXS_STRDUP_A(config_get_string(params, "filebase"));
+        my_instance->filebase = params->get_c_str_copy("filebase");
 
         int cflags = params->get_enum("options", option_values);
         bool error = false;
diff --git a/server/modules/filter/tpmfilter/tpmfilter.cc b/server/modules/filter/tpmfilter/tpmfilter.cc
index 16eb3b200..06a194d33 100644
--- a/server/modules/filter/tpmfilter/tpmfilter.cc
+++ b/server/modules/filter/tpmfilter/tpmfilter.cc
@@ -224,11 +224,11 @@ static MXS_FILTER* createInstance(const char* name, MXS_CONFIG_PARAMETER* params
     {
         my_instance->sessions = 0;
         my_instance->log_enabled = false;
-        my_instance->filename = MXS_STRDUP_A(config_get_string(params, "filename"));
-        my_instance->delimiter = MXS_STRDUP_A(config_get_string(params, "delimiter"));
-        my_instance->query_delimiter = MXS_STRDUP_A(config_get_string(params, "query_delimiter"));
+        my_instance->filename = params->get_c_str_copy("filename");
+        my_instance->delimiter = params->get_c_str_copy("delimiter");
+        my_instance->query_delimiter = params->get_c_str_copy("query_delimiter");
         my_instance->query_delimiter_size = strlen(my_instance->query_delimiter);
-        my_instance->named_pipe = MXS_STRDUP_A(config_get_string(params, "named_pipe"));
+        my_instance->named_pipe = params->get_c_str_copy("named_pipe");
         my_instance->source = params->get_c_str_copy("source");
         my_instance->user = params->get_c_str_copy("user");
 
diff --git a/server/modules/monitor/mariadbmon/mariadbmon.cc b/server/modules/monitor/mariadbmon/mariadbmon.cc
index 3b33850ce..b6015e3ac 100644
--- a/server/modules/monitor/mariadbmon/mariadbmon.cc
+++ b/server/modules/monitor/mariadbmon/mariadbmon.cc
@@ -151,8 +151,8 @@ MariaDBServer* MariaDBMonitor::get_server(SERVER* server)
 bool MariaDBMonitor::set_replication_credentials(const MXS_CONFIG_PARAMETER* params)
 {
     bool rval = false;
-    string repl_user = config_get_string(params, CN_REPLICATION_USER);
-    string repl_pw = config_get_string(params, CN_REPLICATION_PASSWORD);
+    string repl_user = params->get_string(CN_REPLICATION_USER);
+    string repl_pw = params->get_string(CN_REPLICATION_PASSWORD);
 
     if (repl_user.empty() && repl_pw.empty())
     {
@@ -203,8 +203,8 @@ bool MariaDBMonitor::configure(const MXS_CONFIG_PARAMETER* params)
     m_enforce_read_only_slaves = params->get_bool(CN_ENFORCE_READONLY);
     m_verify_master_failure = params->get_bool(CN_VERIFY_MASTER_FAILURE);
     m_master_failure_timeout = params->get_integer(CN_MASTER_FAILURE_TIMEOUT);
-    m_promote_sql_file = config_get_string(params, CN_PROMOTION_SQL_FILE);
-    m_demote_sql_file = config_get_string(params, CN_DEMOTION_SQL_FILE);
+    m_promote_sql_file = params->get_string(CN_PROMOTION_SQL_FILE);
+    m_demote_sql_file = params->get_string(CN_DEMOTION_SQL_FILE);
     m_switchover_on_low_disk_space = params->get_bool(CN_SWITCHOVER_ON_LOW_DISK_SPACE);
     m_maintenance_on_low_disk_space = params->get_bool(CN_MAINTENANCE_ON_LOW_DISK_SPACE);
     m_handle_event_scheduler = params->get_bool(CN_HANDLE_EVENTS);
diff --git a/server/modules/routing/avrorouter/avro.cc b/server/modules/routing/avrorouter/avro.cc
index 913785375..2fef92fef 100644
--- a/server/modules/routing/avrorouter/avro.cc
+++ b/server/modules/routing/avrorouter/avro.cc
@@ -75,7 +75,7 @@ void Avro::read_source_service_options(SERVICE* source)
         }
     }
 
-    for (const auto& opt : mxs::strtok(config_get_string(params, "router_options"), ", \t"))
+    for (const auto& opt : mxs::strtok(params->get_string("router_options"), ", \t"))
     {
         auto kv = mxs::strtok(opt, "=");
 
@@ -129,9 +129,9 @@ Avro* Avro::create(SERVICE* service, SRowEventHandler handler)
 
 Avro::Avro(SERVICE* service, MXS_CONFIG_PARAMETER* params, SERVICE* source, SRowEventHandler handler)
     : service(service)
-    , filestem(config_get_string(params, "filestem"))
-    , binlogdir(config_get_string(params, "binlogdir"))
-    , avrodir(config_get_string(params, "avrodir"))
+    , filestem(params->get_string("filestem"))
+    , binlogdir(params->get_string("binlogdir"))
+    , avrodir(params->get_string("avrodir"))
     , current_pos(4)
     , binlog_fd(-1)
     , trx_count(0)
diff --git a/server/modules/routing/avrorouter/avro_main.cc b/server/modules/routing/avrorouter/avro_main.cc
index 6c69632a2..d67f683a6 100644
--- a/server/modules/routing/avrorouter/avro_main.cc
+++ b/server/modules/routing/avrorouter/avro_main.cc
@@ -63,7 +63,7 @@ MXS_ROUTER* createInstance(SERVICE* service, MXS_CONFIG_PARAMETER* params)
     uint64_t block_size = service->svc_config_param->get_size("block_size");
     mxs_avro_codec_type codec = static_cast<mxs_avro_codec_type>(
             service->svc_config_param->get_enum("codec", codec_values));
-    std::string avrodir = config_get_string(service->svc_config_param, "avrodir");
+    std::string avrodir = service->svc_config_param->get_string("avrodir");
     SRowEventHandler handler(new AvroConverter(avrodir, block_size, codec));
 
     Avro* router = Avro::create(service, handler);
diff --git a/server/modules/routing/binlogrouter/blr.cc b/server/modules/routing/binlogrouter/blr.cc
index 09c093034..eab2f97e5 100644
--- a/server/modules/routing/binlogrouter/blr.cc
+++ b/server/modules/routing/binlogrouter/blr.cc
@@ -430,7 +430,7 @@ static MXS_ROUTER* createInstance(SERVICE* service, MXS_CONFIG_PARAMETER* params
         }
     }
 
-    std::vector<std::string> options = mxs::strtok(config_get_string(params, "router_options"), ", \t");
+    std::vector<std::string> options = mxs::strtok(params->get_string("router_options"), ", \t");
 
     /*
      * Process the options.
diff --git a/server/modules/routing/hintrouter/hintrouter.cc b/server/modules/routing/hintrouter/hintrouter.cc
index f934c56d2..f0396b9da 100644
--- a/server/modules/routing/hintrouter/hintrouter.cc
+++ b/server/modules/routing/hintrouter/hintrouter.cc
@@ -61,7 +61,7 @@ HintRouter* HintRouter::create(SERVICE* pService, MXS_CONFIG_PARAMETER* params)
     HR_ENTRY();
 
     HINT_TYPE default_action = (HINT_TYPE)params->get_enum(DEFAULT_ACTION, default_action_values);
-    string default_server(config_get_string(params, DEFAULT_SERVER));
+    string default_server = params->get_string(DEFAULT_SERVER);
     int max_slaves = params->get_integer(MAX_SLAVES);
     return new HintRouter(pService, default_action, default_server, max_slaves);
 }
diff --git a/server/modules/routing/readconnroute/readconnroute.cc b/server/modules/routing/readconnroute/readconnroute.cc
index 7b4c83422..e31d7eb10 100644
--- a/server/modules/routing/readconnroute/readconnroute.cc
+++ b/server/modules/routing/readconnroute/readconnroute.cc
@@ -104,7 +104,7 @@ bool RCR::configure(MXS_CONFIG_PARAMETER* params)
     uint64_t bitvalue = 0;
     bool ok = true;
 
-    for (const auto& opt : mxs::strtok(config_get_string(params, "router_options"), ", \t"))
+    for (const auto& opt : mxs::strtok(params->get_string("router_options"), ", \t"))
     {
         if (!strcasecmp(opt.c_str(), "master"))
         {
diff --git a/server/modules/routing/readwritesplit/readwritesplit.hh b/server/modules/routing/readwritesplit/readwritesplit.hh
index cfa4ec1b1..01ec32730 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.hh
+++ b/server/modules/routing/readwritesplit/readwritesplit.hh
@@ -152,7 +152,7 @@ struct Config
         , rw_max_slave_conn_percent(0)
         , max_slave_connections(0)
         , causal_reads(params->get_bool("causal_reads"))
-        , causal_reads_timeout(config_get_string(params, "causal_reads_timeout"))
+        , causal_reads_timeout(params->get_string("causal_reads_timeout"))
         , master_reconnection(params->get_bool("master_reconnection"))
         , delayed_retry(params->get_bool("delayed_retry"))
         , delayed_retry_timeout(params->get_integer("delayed_retry_timeout"))