diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp
index 2967b12494..428bd9883c 100644
--- a/stepmania/src/Course.cpp
+++ b/stepmania/src/Course.cpp
@@ -24,6 +24,7 @@
 #include "TitleSubstitution.h"
 #include "Notes.h"
 #include "GameState.h"
+#include "BannerCache.h"
 
 
 Course::Course()
@@ -121,8 +122,13 @@ void Course::LoadFromCRSFile( CString sPath )
 	GetDirListing( sFName + ".bmp", arrayPossibleBanners, false, true );
 	GetDirListing( sFName + ".gif", arrayPossibleBanners, false, true );
 	if( !arrayPossibleBanners.empty() )
+	{
 		m_sBannerPath = arrayPossibleBanners[0];
 
+		/* Cache and load the course banner. */
+		BANNERCACHE->CacheBanner( m_sBannerPath );
+	}
+
 	for( unsigned i=0; i<msd.GetNumValues(); i++ )
 	{
 		CString sValueName = msd.GetParam(i, 0);
diff --git a/stepmania/src/FadingBanner.cpp b/stepmania/src/FadingBanner.cpp
index 81b019cba5..06bf685c9d 100644
--- a/stepmania/src/FadingBanner.cpp
+++ b/stepmania/src/FadingBanner.cpp
@@ -16,6 +16,9 @@
 #include "BannerCache.h"
 #include "song.h"
 #include "RageLog.h"
+#include "course.h"
+#include "PrefsManager.h"
+#include "ThemeManager.h"
 
 /* XXX: metric */
 static const float FadeTime = 0.25;
@@ -34,8 +37,6 @@ void FadingBanner::SetCroppedSize( float fWidth, float fHeight )
 		m_Banner[i].SetCroppedSize( fWidth, fHeight );
 }
 
-#include "PrefsManager.h"
-#include "ThemeManager.h"
 void FadingBanner::Update( float fDeltaTime )
 {
 	ActorFrame::Update( fDeltaTime );
@@ -150,9 +151,9 @@ void FadingBanner::LoadFromGroup( CString sGroupName )
 
 void FadingBanner::LoadFromCourse( Course* pCourse )
 {
-//	LoadFromCachedBanner( pCourse->GetBannerPath() );
-	BeforeChange();
-	m_Banner[GetBackIndex()].LoadFromCourse( pCourse );
+	LoadFromCachedBanner( pCourse->m_sBannerPath );
+//	BeforeChange();
+//	m_Banner[GetBackIndex()].LoadFromCourse( pCourse );
 }
 
 void FadingBanner::LoadRoulette()