diff --git a/dbrow3mapper.cfc b/dbrow3mapper.cfc
index a120d50..ee60b4d 100644
--- a/dbrow3mapper.cfc
+++ b/dbrow3mapper.cfc
@@ -12,16 +12,12 @@
 	<cffunction name="init" returntype="dbrow3mapper" output="yes" access="public">
 		<cfargument name="applicationName" type="string" required="true">
 		<cfargument name="useCacheFile" type="boolean" required="true">
-		<cfargument name="deleteCacheFile" type="boolean" required="true" hint="delete first, then rebuild">
+		<cfargument name="deleteCacheFile" type="boolean" required="true" hint="Regenerate and replace cache">
 		<cfargument name="cacheDir" type="string" default="#getTempDirectory()#">
 
 		<cfset var cacheFile = "#arguments.cacheDir#/dbrow3mapper_#arguments.applicationName#.xml">
 		<cfset var cacheXML = "">
 
-		<cfif arguments.deleteCacheFile>
-			<cfset deleteFileIfExists(cacheFile)>
-		</cfif>
-
 		<!--- Private variables - leon 12/12/07 --->
 		<cfset stObjInfo = structNew() />
 		<cfset stObjInfo.stTableToObject = structNew()>
@@ -31,18 +27,12 @@
 		<cfset stObjInfo.stObjectToPath = structNew()>
 		<cfset stObjInfo.rsTypeTable = QueryNew( "tableName,immutableName,id,objPath" ) >
 
-		<!--- Figure out if we should use the cache file instead of instantiating
-			all of the objects.
-
-			This is much faster than instantiation, but won't include objects/
-			tables created after the cache file was last built. As such, the
-			default behavior is to not use the cache file. - leon 2/21/11 --->
 		<cfif arguments.useCacheFile AND NOT Len(Trim(arguments.applicationName))>
-			<cflog type="warning" text="App indicated that dbrow3mapper cache should be used,
-				but application.applicationName is not present, so we can't name the cache file and won't use it.">
+			<cfthrow message="App indicated that dbrow3mapper cache should be used,
+				but application.applicationName is not present, so we can't name the cache file.">
 		</cfif>
 
-		<cfif arguments.useCacheFile and fileExists(cacheFile)>
+		<cfif arguments.useCacheFile and not arguments.deleteCacheFile and fileExists(cacheFile)>
 			<cfset logIt("Reading cache file: #cacheFile#") />
 			<cffile action="read" file="#cacheFile#" variable="cacheXML" />
 
@@ -50,10 +40,10 @@
 			<cfwddx action="wddx2cfml" input="#cacheXML#" output="stObjInfo" />
 
 		<cfelse>
-			<cfset logIt('Cache file not present or being ignored. Scanning for objects.') />
+			<cfset logIt('Cache file not present, being ignored, or being replaced. Scanning for objects.') />
 			<cfset this.scanForObjects()>
 
-			<cfif arguments.useCacheFile>
+			<cfif arguments.useCacheFile or arguments.deleteCacheFile>
 				<cfset logIt('Serializing stObjInfo scope to XML') />
 				<cfwddx action="cfml2wddx" input="#stObjInfo#" output="cacheXML" />