Index: src/libchcore/TTask.cpp
===================================================================
diff -u -N -ra44714d5c7ec0f50a376f4d0ea919ee5a224f834 -r121d674474766192b5bf02afda67fb962635f56b
--- src/libchcore/TTask.cpp	(.../TTask.cpp)	(revision a44714d5c7ec0f50a376f4d0ea919ee5a224f834)
+++ src/libchcore/TTask.cpp	(.../TTask.cpp)	(revision 121d674474766192b5bf02afda67fb962635f56b)
@@ -45,10 +45,9 @@
 	m_log(),
 	m_spFeedbackHandler(spFeedbackHandler),
 	m_spSrcPaths(new TBasePathDataContainer),
-	m_files(),
 	m_bForce(false),
 	m_bContinue(false),
-	m_tSubTaskContext(m_tConfiguration, m_spSrcPaths, m_afFilters, m_files,
+	m_tSubTaskContext(m_tConfiguration, m_spSrcPaths, m_afFilters,
 		m_cfgTracker, m_log, spFeedbackHandler, m_workerThread, m_fsLocal),
 	m_tSubTasksArray(m_tSubTaskContext),
 	m_spSerializer(spSerializer)
@@ -71,7 +70,6 @@
 	m_tBaseData.SetTaskName(rTaskDefinition.GetTaskName());
 
 	m_tSubTasksArray.Init(rTaskDefinition.GetOperationPlan());
-	m_files.Clear();
 	m_tSubTaskContext.SetOperationType(m_tSubTasksArray.GetOperationType());
 	m_tSubTaskContext.SetDestinationPath(m_tBaseData.GetDestinationPath());
 }
@@ -147,7 +145,7 @@
 		m_spSrcPaths->Load(spContainer);
 
 		spContainer = m_spSerializer->GetContainer(_T("scanned_files"));
-		m_files.Load(spContainer, m_spSrcPaths);
+		m_tSubTaskContext.GetFilesCache().Load(spContainer, m_spSrcPaths);
 
 		spContainer = m_spSerializer->GetContainer(_T("task_config"));
 		m_tConfiguration.Load(spContainer);
@@ -221,7 +219,7 @@
 		m_spSrcPaths->Store(spContainer);
 
 		spContainer = m_spSerializer->GetContainer(_T("scanned_files"));
-		m_files.Store(spContainer);
+		m_tSubTaskContext.GetFilesCache().Store(spContainer);
 
 		spContainer = m_spSerializer->GetContainer(_T("task_config"));
 		m_tConfiguration.Store(spContainer);
@@ -542,8 +540,8 @@
 		}
 
 		// if the files cache is not completely read - clean it up
-		if(!m_files.IsComplete())
-			m_files.Clear();		// get rid of m_files contents; rare state not modified, since incomplete cache is not being stored
+		if(!m_tSubTaskContext.GetFilesCache().IsComplete())
+			m_tSubTaskContext.GetFilesCache().Clear();		// get rid of m_files contents; rare state not modified, since incomplete cache is not being stored
 
 		// save progress before killed
 		Store();