diff --git a/includes/MediaYouTubeStreamWrapper.inc b/includes/MediaYouTubeStreamWrapper.inc
index df3b44f..e1e7862 100644
--- a/includes/MediaYouTubeStreamWrapper.inc
+++ b/includes/MediaYouTubeStreamWrapper.inc
@@ -34,7 +34,7 @@ class MediaYouTubeStreamWrapper extends MediaReadOnlyStreamWrapper {
 
   function getLocalThumbnailPath() {
     $parts = $this->get_parameters();
-    $local_path = file_default_scheme() . '://media-youtube/' . check_plain($parts['v']) . '.jpg';
+    $local_path = file_default_scheme() . '://media-youtube/' . check_plain($parts['v']) . '/' . check_plain($parts['v']) . '.jpg';
 
     if (!file_exists($local_path)) {
       // getOriginalThumbnailPath throws an exception if there are any errors
diff --git a/media_youtube.file.inc b/media_youtube.file.inc
index 6eb9952..665cc0a 100644
--- a/media_youtube.file.inc
+++ b/media_youtube.file.inc
@@ -37,6 +37,7 @@ function media_youtube_cache_clear($fids) {
   foreach ($files as $file) {
     $wrapper = file_stream_wrapper_get_instance_by_uri($file->uri);
     $local_path = $wrapper->getLocalThumbnailPath();
-    file_unmanaged_delete($local_path);
+    $dir_path = dirname($local_path);
+    file_unmanaged_delete_recursive($dir_path);
   }
 }