diff --git a/include/spdlog/common.h b/include/spdlog/common.h
index c18d203e..668889f0 100644
--- a/include/spdlog/common.h
+++ b/include/spdlog/common.h
@@ -18,7 +18,7 @@
 #include <string>
 #include <unordered_map>
 
-#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
+#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
 #include <codecvt>
 #include <locale>
 #endif
diff --git a/include/spdlog/details/logger_impl.h b/include/spdlog/details/logger_impl.h
index 9b9b467f..6ad2b6fd 100644
--- a/include/spdlog/details/logger_impl.h
+++ b/include/spdlog/details/logger_impl.h
@@ -173,24 +173,25 @@ inline void spdlog::logger::critical(const T &msg)
 }
 
 #ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
-#include <codecvt>
-#include <locale>
-
-template<typename... Args>
-inline void spdlog::logger::log(level::level_enum lvl, const wchar_t *msg)
-{
-    std::wstring_convert<std::codecvt_utf8<wchar_t>> conv;
-
-    log(lvl, conv.to_bytes(msg));
-}
-
 template<typename... Args>
 inline void spdlog::logger::log(level::level_enum lvl, const wchar_t *fmt, const Args &... args)
-{
-    fmt::WMemoryWriter wWriter;
+{   
+	if (!should_log(lvl))
+	{
+		return;
+	}
+	
+	decltype(wstring_converter_)::byte_string utf8_string;
 
-    wWriter.write(fmt, args...);
-    log(lvl, wWriter.c_str());
+	try
+	{
+		{
+			std::lock_guard<std::mutex> lock(wstring_converter_mutex_);
+			utf8_string = wstring_converter_.to_bytes(fmt);
+		}
+		log(lvl, utf8_string.c_str(), args...);		
+	}
+	SPDLOG_CATCH_AND_HANDLE				
 }
 
 template<typename... Args>
diff --git a/include/spdlog/logger.h b/include/spdlog/logger.h
index 372d8314..5399dabd 100644
--- a/include/spdlog/logger.h
+++ b/include/spdlog/logger.h
@@ -63,10 +63,7 @@ public:
     template<typename... Args>
     void critical(const char *fmt, const Args &... args);
 
-#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
-    template<typename... Args>
-    void log(level::level_enum lvl, const wchar_t *msg);
-
+#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT    
     template<typename... Args>
     void log(level::level_enum lvl, const wchar_t *fmt, const Args &... args);
 
@@ -152,6 +149,11 @@ protected:
     log_err_handler err_handler_;
     std::atomic<time_t> last_err_time_;
     std::atomic<size_t> msg_counter_;
+
+#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
+	std::wstring_convert<std::codecvt_utf8<wchar_t>> wstring_converter_;
+	std::mutex wstring_converter_mutex_;
+#endif
 };
 } // namespace spdlog