diff --git a/src/libtomahawk/utils/tomahawkcache.cpp b/src/libtomahawk/utils/tomahawkcache.cpp
index 9859720c1..47692b2da 100644
--- a/src/libtomahawk/utils/tomahawkcache.cpp
+++ b/src/libtomahawk/utils/tomahawkcache.cpp
@@ -25,17 +25,17 @@
 
 using namespace TomahawkUtils;
 
-TomahawkCache*TomahawkCache::s_instance = 0;
+Cache*Cache::s_instance = 0;
 
-TomahawkCache* TomahawkCache::instance()
+Cache* Cache::instance()
 {
     if ( !s_instance )
-        s_instance = new TomahawkCache();
+        s_instance = new Cache();
 
     return s_instance;
 }
 
-TomahawkCache::TomahawkCache()
+Cache::Cache()
     : QObject ( 0 )
     , m_cacheBaseDir ( TomahawkSettings::instance()->storageCacheLocation() + "/GenericCache/" )
     , m_cacheManifest ( m_cacheBaseDir + "cachemanifest.ini", QSettings::IniFormat )
@@ -46,12 +46,12 @@ TomahawkCache::TomahawkCache()
     m_pruneTimer.start();
 }
 
-TomahawkCache::~TomahawkCache()
+Cache::~Cache()
 {
 
 }
 
-void TomahawkCache::pruneTimerFired()
+void Cache::pruneTimerFired()
 {
     qDebug() << Q_FUNC_INFO << "Pruning tomahawkcache";
     qlonglong currentMSecsSinceEpoch = QDateTime::currentMSecsSinceEpoch();
@@ -77,7 +77,7 @@ void TomahawkCache::pruneTimerFired()
 }
 
 
-QVariant TomahawkCache::getData ( const QString& identifier, const QString& key )
+QVariant Cache::getData ( const QString& identifier, const QString& key )
 {
     const QString cacheDir = m_cacheBaseDir + identifier;
     QSettings cached_settings ( cacheDir, QSettings::IniFormat );
@@ -96,15 +96,17 @@ QVariant TomahawkCache::getData ( const QString& identifier, const QString& key
     return QVariant();
 }
 
-void TomahawkCache::putData ( const QString& identifier, qint64 maxAge, const QString& key, const QVariant& value )
+void Cache::putData ( const QString& identifier, qint64 maxAge, const QString& key, const QVariant& value )
 {
+    QMutexLocker mutex_locker( &m_mutex );
+
     const QString cacheDir = m_cacheBaseDir + identifier;
     addClient ( identifier );
     QSettings cached_settings ( cacheDir, QSettings::IniFormat );
     cached_settings.setValue ( key, QVariant::fromValue ( CacheData ( maxAge, value ) ) );
 }
 
-void TomahawkCache::addClient ( const QString& identifier )
+void Cache::addClient ( const QString& identifier )
 {
     QVariantList clients = m_cacheManifest.value ( "clients" ).toList();
     foreach ( const QVariant &client, clients ) {
@@ -118,7 +120,7 @@ void TomahawkCache::addClient ( const QString& identifier )
     m_cacheManifest.sync();
 }
 
-void TomahawkCache::removeClient ( const QString& identifier )
+void Cache::removeClient ( const QString& identifier )
 {
     QVariantList clients = m_cacheManifest.value ( "clients" ).toList();
     QVariantList::iterator it = clients.begin();
diff --git a/src/libtomahawk/utils/tomahawkcache.h b/src/libtomahawk/utils/tomahawkcache.h
index 175fb2e4f..b28a377c1 100644
--- a/src/libtomahawk/utils/tomahawkcache.h
+++ b/src/libtomahawk/utils/tomahawkcache.h
@@ -39,13 +39,13 @@ struct CacheData {
     QVariant data;
 };
 
-class DLLEXPORT TomahawkCache : public QObject
+class DLLEXPORT Cache : public QObject
 {
 Q_OBJECT
 
 public:
-    static TomahawkCache* instance();
-    virtual ~TomahawkCache();
+    static Cache* instance();
+    virtual ~Cache();
 
     void putData( const QString &identifier, qint64 maxAge, const QString &key, const QVariant& value );
     QVariant getData( const QString &identifier, const QString &key );
@@ -54,8 +54,8 @@ private slots:
     void pruneTimerFired();
 
 private:
-    TomahawkCache();
-    static TomahawkCache* s_instance;
+    Cache();
+    static Cache* s_instance;
 
     void addClient( const QString &identifier );
     void removeClient( const QString &identifier );
diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp
index 044395aae..f10310168 100644
--- a/src/tomahawkapp.cpp
+++ b/src/tomahawkapp.cpp
@@ -319,7 +319,7 @@ TomahawkApp::~TomahawkApp()
         delete m_audioEngine.data();
 
     delete Tomahawk::Accounts::AccountManager::instance();
-    delete TomahawkUtils::TomahawkCache::instance();
+    delete TomahawkUtils::Cache::instance();
 
 #ifndef ENABLE_HEADLESS
     delete m_mainwindow;