diff -Nru clementine-1.2.3-1306/debian/changelog clementine-1.2.3-1308/debian/changelog
--- clementine-1.2.3-1306/debian/changelog	2015-08-24 08:28:20.000000000 +0000
+++ clementine-1.2.3-1308/debian/changelog	2015-08-24 15:57:07.000000000 +0000
@@ -1,5 +1,5 @@
-clementine (1.2.3-1306-gd97e9ae~vivid) vivid; urgency=low
+clementine (1.2.3-1308-g5257922~vivid) vivid; urgency=low
 
-  * Version 1.2.3-1306-gd97e9ae
+  * Version 1.2.3-1308-g5257922
 
- -- David Sansome <me@davidsansome.com>  Mon, 24 Aug 2015 08:28:20 +0000
+ -- David Sansome <me@davidsansome.com>  Mon, 24 Aug 2015 15:57:07 +0000
diff -Nru clementine-1.2.3-1306/debian/rules clementine-1.2.3-1308/debian/rules
--- clementine-1.2.3-1306/debian/rules	2015-08-24 08:28:20.000000000 +0000
+++ clementine-1.2.3-1308/debian/rules	2015-08-24 15:57:07.000000000 +0000
@@ -13,7 +13,7 @@
 	cd bin && cmake .. \
 	  -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/clementine/usr \
 	  -DBUNDLE_PROJECTM_PRESETS=OFF \
-	  -DFORCE_GIT_REVISION=1.2.3-1306-gd97e9ae
+	  -DFORCE_GIT_REVISION=1.2.3-1308-g5257922
 	touch configure-stamp
 
 build: build-stamp
diff -Nru clementine-1.2.3-1306/dist/clementine.spec clementine-1.2.3-1308/dist/clementine.spec
--- clementine-1.2.3-1306/dist/clementine.spec	2015-08-24 08:28:19.000000000 +0000
+++ clementine-1.2.3-1308/dist/clementine.spec	2015-08-24 15:57:07.000000000 +0000
@@ -1,12 +1,12 @@
 Name:           clementine
 Version:        1.2.3
-Release:        2.1306.gd97e9ae.fc13
+Release:        2.1308.g5257922.fc13
 Summary:        A music player and library organiser
 
 Group:          Applications/Multimedia
 License:        GPLv3
 URL:            http://www.clementine-player.org/
-Source0:        %{name}-1.2.3-1306-gd97e9ae.tar.gz
+Source0:        %{name}-1.2.3-1308-g5257922.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils liblastfm-devel taglib-devel gettext
@@ -56,7 +56,7 @@
   * Queue manager
 
 %prep
-%setup -q -n %{name}-1.2.3-1306-gd97e9ae
+%setup -q -n %{name}-1.2.3-1308-g5257922
 
 
 %build
@@ -92,4 +92,4 @@
 
 %changelog
 * Mon Aug 24 2015 David Sansome <me@davidsansome.com> - 1.2.3
-- Version 1.2.3-1306-gd97e9ae
+- Version 1.2.3-1308-g5257922
diff -Nru clementine-1.2.3-1306/dist/Info.plist clementine-1.2.3-1308/dist/Info.plist
--- clementine-1.2.3-1306/dist/Info.plist	2015-08-24 08:28:19.000000000 +0000
+++ clementine-1.2.3-1308/dist/Info.plist	2015-08-24 15:57:07.000000000 +0000
@@ -9,7 +9,7 @@
   <key>CFBundleExecutable</key>
   <string>clementine</string>
   <key>CFBundleGetInfoString</key>
-  <string>Clementine 1.2.3-1306-gd97e9ae</string>
+  <string>Clementine 1.2.3-1308-g5257922</string>
   <key>CFBundleIconFile</key>
   <string>clementine</string>
   <key>CFBundleIdentifier</key>
@@ -17,15 +17,15 @@
   <key>CFBundleInfoDictionaryVersion</key>
   <string>6.0</string>
   <key>CFBundleLongVersionString</key>
-  <string>1.2.3-1306-gd97e9ae</string>
+  <string>1.2.3-1308-g5257922</string>
   <key>CFBundleName</key>
   <string>Clementine</string>
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.2.3-1306-gd97e9ae</string>
+  <string>1.2.3-1308-g5257922</string>
   <key>CFBundleVersion</key>
-  <string>4096.1.2.3.2.1306</string>
+  <string>4096.1.2.3.2.1308</string>
   <key>CSResourcesFileMapped</key>
   <true/>
   <key>LSRequiresCarbon</key>
diff -Nru clementine-1.2.3-1306/dist/maketarball.sh clementine-1.2.3-1308/dist/maketarball.sh
--- clementine-1.2.3-1306/dist/maketarball.sh	2015-08-24 08:28:19.000000000 +0000
+++ clementine-1.2.3-1308/dist/maketarball.sh	2015-08-24 15:57:07.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 name=clementine
-version="1.2.3-1306-gd97e9ae"
+version="1.2.3-1308-g5257922"
 deb_dist="vivid"
 root=$(cd "${0%/*}/.." && echo $PWD/${0##*/})
 root=`dirname "$root"`
diff -Nru clementine-1.2.3-1306/dist/windows/clementine.nsi clementine-1.2.3-1308/dist/windows/clementine.nsi
--- clementine-1.2.3-1306/dist/windows/clementine.nsi	2015-08-24 08:28:19.000000000 +0000
+++ clementine-1.2.3-1308/dist/windows/clementine.nsi	2015-08-24 15:57:07.000000000 +0000
@@ -3,8 +3,8 @@
 !define PRODUCT_PUBLISHER "Clementine"
 !define PRODUCT_VERSION_MAJOR 1
 !define PRODUCT_VERSION_MINOR 2
-!define PRODUCT_DISPLAY_VERSION "1.2.3-1306-gd97e9ae"
-!define PRODUCT_DISPLAY_VERSION_SHORT "1.2.3-1306-gd97e9ae"
+!define PRODUCT_DISPLAY_VERSION "1.2.3-1308-g5257922"
+!define PRODUCT_DISPLAY_VERSION_SHORT "1.2.3-1308-g5257922"
 !define PRODUCT_WEB_SITE "http://www.clementine-player.org/"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
@@ -104,7 +104,7 @@
 !insertmacro MUI_LANGUAGE "Esperanto"
 
 Name "${PRODUCT_NAME}"
-OutFile "${PRODUCT_NAME}Setup-1.2.3-1306-gd97e9ae.exe"
+OutFile "${PRODUCT_NAME}Setup-1.2.3-1308-g5257922.exe"
 InstallDir "${PRODUCT_INSTALL_DIR}"
 
 ; Get the path where Clementine was installed previously and set it as default path
diff -Nru clementine-1.2.3-1306/dist/windows/clementine-portable.nsi clementine-1.2.3-1308/dist/windows/clementine-portable.nsi
--- clementine-1.2.3-1306/dist/windows/clementine-portable.nsi	2015-08-24 08:28:19.000000000 +0000
+++ clementine-1.2.3-1308/dist/windows/clementine-portable.nsi	2015-08-24 15:57:07.000000000 +0000
@@ -3,8 +3,8 @@
 !define PRODUCT_PUBLISHER "Clementine"
 !define PRODUCT_VERSION_MAJOR 1
 !define PRODUCT_VERSION_MINOR 2
-!define PRODUCT_DISPLAY_VERSION "1.2.3-1306-gd97e9ae"
-!define PRODUCT_DISPLAY_VERSION_SHORT "1.2.3-1306-gd97e9ae"
+!define PRODUCT_DISPLAY_VERSION "1.2.3-1308-g5257922"
+!define PRODUCT_DISPLAY_VERSION_SHORT "1.2.3-1308-g5257922"
 !define PRODUCT_WEB_SITE "http://www.clementine-player.org/"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
@@ -104,7 +104,7 @@
 !insertmacro MUI_LANGUAGE "Esperanto"
 
 Name "${PRODUCT_NAME}"
-OutFile "${PRODUCT_NAME}Setup-1.2.3-1306-gd97e9ae.exe"
+OutFile "${PRODUCT_NAME}Setup-1.2.3-1308-g5257922.exe"
 InstallDir "${PRODUCT_INSTALL_DIR}"
 
 ; Get the path where Clementine was installed previously and set it as default path
diff -Nru clementine-1.2.3-1306/src/internet/vk/vkservice.cpp clementine-1.2.3-1308/src/internet/vk/vkservice.cpp
--- clementine-1.2.3-1306/src/internet/vk/vkservice.cpp	2015-08-24 08:28:06.000000000 +0000
+++ clementine-1.2.3-1308/src/internet/vk/vkservice.cpp	2015-08-24 15:57:00.000000000 +0000
@@ -1191,7 +1191,11 @@
   if (media_url.isValid()) {
     Song song = FromAudioItem(audio_item);
     SongStarting(song);
-    cache_->AddToCache(url, media_url);
+
+    if (cachingEnabled_) {
+      cache_->AddToCache(url, media_url);
+    }
+
     return UrlHandler::LoadResult(url, UrlHandler::LoadResult::TrackAvailable,
                                   media_url, song.length_nanosec());
   }