diff --git a/build.xml b/build.xml
index c2076ed9..382121fe 100644
--- a/build.xml
+++ b/build.xml
@@ -20,11 +20,12 @@
 	<property name="dir.lib" location="${basedir}/lib" />
 	<property name="dir.website" location="${basedir}/website" />
 	<property name="dir.installer" location="${basedir}/installer" />
-	<property name="dir.cache" location="${basedir}/cache" />
 
 	<!-- define output paths -->
 	<property name="path.fatjar" location="${dir.dist}/${title}_${version}.jar" />
 
+	<property name="basedir.cache" location="${basedir}/cache" />
+	<property name="dir.cache" location="${basedir.cache}/${title}_${version}" />
 	<property name="basedir.release" location="${basedir}/release" />
 	<property name="dir.release" location="${basedir.release}/${title}_${version}" />
 
@@ -577,7 +578,7 @@
 		<copy todir="${dir.dist}/appx/jre">
 			<tarfileset>
 				<gzipresource>
-					<file file="${dir.cache}/jre-${jre.major}u${jre.build}-windows-x64.tar.gz" />
+					<file file="${basedir.cache}/jre-${jre.major}u${jre.build}-windows-x64.tar.gz" />
 				</gzipresource>
 			</tarfileset>
 			<cutdirsmapper dirs="1" />
@@ -721,6 +722,7 @@
 		<mkdir dir="${dir.build}" />
 		<mkdir dir="${dir.dist}" />
 		<mkdir dir="${dir.release}" />
+		<mkdir dir="${dir.cache}" />
 
 		<path id="lib.classpath">
 			<fileset dir="${dir.lib}" includes="**/*.jar" excludes="**/*-jdk14.jar" />
@@ -749,12 +751,12 @@
 			</fileset>
 		</copy>
 
-		<checksum algorithm="SHA-256" pattern="{0}	{1}" todir="${dir.cache}/sha/${title}_${version}">
+		<checksum algorithm="SHA-256" pattern="{0}	{1}" todir="${dir.cache}" fileext=".sha256">
 			<fileset dir="${dir.release}" />
 		</checksum>
 		<concat destfile="${dir.release}/README.md" overwrite="true" eol="unix" outputencoding="UTF-8">
 			<fileset file="${dir.installer}/ant/digest.header.md" />
-			<fileset dir="${dir.cache}/sha/${title}_${version}" />
+			<fileset dir="${dir.cache}" includes="*.sha256" />
 			<fileset file="${dir.installer}/ant/digest.footer.md" />
 		</concat>
 	</target>
@@ -814,7 +816,7 @@
 		<scp todir="${deploy.website}" trust="yes" verbose="true" sftp="true" keyfile="${deploy.keyfile}">
 			<fileset dir="${dir.dist}/website">
 				<modified>
-					<param name="cache.cachefile" value="${dir.cache}/scp.cache" />
+					<param name="cache.cachefile" value="${basedir.cache}/scp.cache" />
 				</modified>
 			</fileset>
 		</scp>
@@ -881,7 +883,7 @@
 				<include name="data/*.txt" />
 				<include name="data/*.xz" />
 				<modified>
-					<param name="cache.cachefile" value="${dir.cache}/scp.cache" />
+					<param name="cache.cachefile" value="${basedir.cache}/scp.cache" />
 				</modified>
 			</fileset>
 		</scp>
@@ -898,6 +900,7 @@
 		<input addproperty="mark" message="Mark:" />
 		<antcall target="deploy-release">
 			<param name="dir.release" location="${basedir.release}/HEAD/${title}_${version}_${mark}" />
+			<param name="dir.cache" location="${basedir.cache}/HEAD/${title}_${version}_${mark}" />
 		</antcall>
 	</target>