diff --git a/checkin_notes b/checkin_notes
index b8cc334e19..c13ee120d0 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -3920,3 +3920,10 @@ Charlie 17 Apr 2006
         release_GridRepublic.sh
     doc/
         versions.inc
+
+Rom    17 Apr 2006
+    - Clean up the caching scheme used in the manager
+
+    clientgui/
+        MainDocument.cpp
+        MainFrame.cpp
diff --git a/clientgui/ViewMessages.cpp b/clientgui/ViewMessages.cpp
index 93622db90c..800218cad7 100644
--- a/clientgui/ViewMessages.cpp
+++ b/clientgui/ViewMessages.cpp
@@ -204,12 +204,7 @@ void CViewMessages::OnMessagesCopySelected( wxCommandEvent& WXUNUSED(event) ) {
 
 
 wxInt32 CViewMessages::GetDocCount() {
-    CMainDocument* pDoc      = wxGetApp().GetDocument();
-
-    wxASSERT(pDoc);
-    wxASSERT(wxDynamicCast(pDoc, CMainDocument));
-
-    return pDoc->GetMessageCount();
+    return wxGetApp().GetDocument()->GetMessageCount();
 }
 
 
diff --git a/clientgui/ViewProjects.cpp b/clientgui/ViewProjects.cpp
index 0a9da38f85..630a8b0544 100644
--- a/clientgui/ViewProjects.cpp
+++ b/clientgui/ViewProjects.cpp
@@ -389,12 +389,7 @@ void CViewProjects::OnProjectWebsiteClicked( wxEvent& event ) {
 
 
 wxInt32 CViewProjects::GetDocCount() {
-    CMainDocument* pDoc      = wxGetApp().GetDocument();
-
-    wxASSERT(pDoc);
-    wxASSERT(wxDynamicCast(pDoc, CMainDocument));
-
-    return pDoc->GetProjectCount();
+    return wxGetApp().GetDocument()->GetProjectCount();
 }
 
 
diff --git a/clientgui/ViewResources.cpp b/clientgui/ViewResources.cpp
index e2a969fd43..6e4f6e695c 100644
--- a/clientgui/ViewResources.cpp
+++ b/clientgui/ViewResources.cpp
@@ -98,12 +98,7 @@ const char** CViewResources::GetViewIcon() {
 
 
 wxInt32 CViewResources::GetDocCount() {
-    CMainDocument* pDoc      = wxGetApp().GetDocument();
-
-    wxASSERT(pDoc);
-    wxASSERT(wxDynamicCast(pDoc, CMainDocument));
-
-    return pDoc->GetResourceCount();
+    return wxGetApp().GetDocument()->GetResourceCount();
 }
 
 
diff --git a/clientgui/ViewStatistics.cpp b/clientgui/ViewStatistics.cpp
index b29422622e..c605e39745 100644
--- a/clientgui/ViewStatistics.cpp
+++ b/clientgui/ViewStatistics.cpp
@@ -923,12 +923,7 @@ bool CViewStatistics::OnRestoreState(wxConfigBase* pConfig) {
 }
 
 void CViewStatistics::OnListRender( wxTimerEvent& WXUNUSED(event) ) {
-    CMainDocument* pDoc      = wxGetApp().GetDocument();
-
-    wxASSERT(pDoc);
-    wxASSERT(wxDynamicCast(pDoc, CMainDocument));
-
-	if (pDoc->GetStatisticsCount()) {
+	if (wxGetApp().GetDocument()->GetStatisticsCount()) {
 		m_PaintStatistics->Refresh();
 	}
 }
diff --git a/clientgui/ViewTransfers.cpp b/clientgui/ViewTransfers.cpp
index 796599793a..2ea8c04606 100644
--- a/clientgui/ViewTransfers.cpp
+++ b/clientgui/ViewTransfers.cpp
@@ -212,12 +212,7 @@ void CViewTransfers::OnTransfersAbort( wxCommandEvent& WXUNUSED(event) ) {
 
 
 wxInt32 CViewTransfers::GetDocCount() {
-    CMainDocument* pDoc      = wxGetApp().GetDocument();
-
-    wxASSERT(pDoc);
-    wxASSERT(wxDynamicCast(pDoc, CMainDocument));
-
-    return pDoc->GetTransferCount();
+    return wxGetApp().GetDocument()->GetTransferCount();
 }
 
 
diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp
index 8aeea46acd..3d6fcb48b5 100644
--- a/clientgui/ViewWork.cpp
+++ b/clientgui/ViewWork.cpp
@@ -336,12 +336,7 @@ void CViewWork::OnProjectWebsiteClicked( wxEvent& event ) {
 
 
 wxInt32 CViewWork::GetDocCount() {
-    CMainDocument* pDoc      = wxGetApp().GetDocument();
-
-    wxASSERT(pDoc);
-    wxASSERT(wxDynamicCast(pDoc, CMainDocument));
-
-    return pDoc->GetWorkCount();
+    return wxGetApp().GetDocument()->GetWorkCount();
 }
 
 
diff --git a/doc/app_debug_win.php b/doc/app_debug_win.php
index a3a29a6fe7..06b9ed7a5b 100644
--- a/doc/app_debug_win.php
+++ b/doc/app_debug_win.php
@@ -6,9 +6,9 @@ echo "
 
 <h4>Debugger version</h4>
 
-<table>
+<table width=100%>
   <tr>
-    <td bgcolor=ddddff>
+    <td bgcolor=ddddff width=100%>
       <pre>
 BOINC Windows Runtime Debugger Version 5.5.0
 
@@ -22,13 +22,21 @@ srv*C:\\DOCUME~1\\romw\\LOCALS~1\\Temp\\symbols*http://boinc.berkeley.edu/symsto
     </td>
   </tr>
 </table>
-
-
+<p>
+This area provides some basic information about the version of the BOINC debugger 
+being used, when the crash occured, and what the internal version of the Windows
+debugger technology is being used.
+<p>
+Symbol search paths are used to inform the debugger where it might be able to
+find the symbol files related to the modules loaded in memory.  Entries prefixed with
+'srv*' are used to denote a web based symbol store.  DbgHelp will use them if
+symsrv can be loaded at the time of the crash.
+<p>
 <h4>Module List</h4>
 
-<table>
+<table width=100%>
   <tr>
-    <td bgcolor=ddddff>
+    <td bgcolor=ddddff width=100%>
       <pre>
 ModLoad: 00400000 00060000 C:\\BOINCSRC\\Main\\boinc_samples\\win_build\\Release\\uppercase_5.10_windows_intelx86.exe (PDB Symbols Loaded)
 ModLoad: 7c800000 000c0000 C:\\WINDOWS\\system32\\ntdll.dll (5.2.3790.1830) (PDB Symbols Loaded)
@@ -40,13 +48,19 @@ ModLoad: 7c800000 000c0000 C:\\WINDOWS\\system32\\ntdll.dll (5.2.3790.1830) (PDB
     </td>
   </tr>
 </table>
-
-
+<p>
+Information about which modules were loaded into the processes memory space can be 
+found here. The first hexdecimal value is the address in memory in which the module
+was loaded, the second hexdecimal is the size of the module.
+<p>
+If a version record was found inside the module, it'll be dumped out as part of the
+module list dump.
+<p>
 <h4>Exception Record</h4>
 
-<table>
+<table width=100%>
   <tr>
-    <td bgcolor=ddddff>
+    <td bgcolor=ddddff width=100%>
       <pre>
 *** UNHANDLED EXCEPTION ****
 Reason: Breakpoint Encountered (0x80000003) at address 0x7C822583
@@ -54,13 +68,14 @@ Reason: Breakpoint Encountered (0x80000003) at address 0x7C822583
     </td>
   </tr>
 </table>
+<p>
 
 
-<h4>Exception Record</h4>
+<h4>Stack traces</h4>
 
-<table>
+<table width=100%>
   <tr>
-    <td bgcolor=ddddff>
+    <td bgcolor=ddddff width=100%>
       <pre>
 *** Dump of the Worker(offending) thread: ***
 eax=00000000 ebx=00000000 ecx=77e4245b edx=7c82ed54 esi=77e424a8 edi=00454f20