diff --git a/dev-utils/_windows/ccache/ccache.py b/dev-utils/_autotools/ccache/ccache.py
similarity index 56%
rename from dev-utils/_windows/ccache/ccache.py
rename to dev-utils/_autotools/ccache/ccache.py
index 9370e256..59b7733b 100644
--- a/dev-utils/_windows/ccache/ccache.py
+++ b/dev-utils/_autotools/ccache/ccache.py
@@ -1,35 +1,34 @@
 # -*- coding: utf-8 -*-
 import info
 
 
 class subinfo(info.infoclass):
     def setTargets(self):
         self.svnTargets['master'] = "https://github.com/jrosdahl/ccache.git"
         self.targetInstallPath["master"] = "dev-utils"
-        self.defaultTarget = 'master'
+
+        for ver in ["3.7.5"]:
+            self.targets[ver] = f"https://github.com/ccache/ccache/releases/download/v{ver}/ccache-{ver}.tar.gz"
+            self.targetInstSrc[ver] = f"ccache-{ver}"
+            self.targetInstallPath[ver] = "dev-utils"
+        
+        self.targetDigests["3.7.5"] = (['058cc18a25d57c0fd9aa494efdee3cc567b1b60ba1c80a18c5a0128c23832c09'], CraftHash.HashAlgorithm.SHA256)
+       
+        self.webpage = "https://ccache.dev/"
+        self.defaultTarget = "3.7.5"
 
     def setDependencies(self):
         self.runtimeDependencies["virtual/base"] = None
         if CraftCore.compiler.isMinGW():
             self.buildDependencies["dev-utils/msys"] = None
 
 
 from Package.AutoToolsPackageBase import *
 from Package.VirtualPackageBase import *
 
 
-class PackageMinGW(AutoToolsPackageBase):
+class Package(AutoToolsPackageBase):
     def __init__(self, **args):
         AutoToolsPackageBase.__init__(self)
         self.subinfo.options.configure.args = "--with-bundled-zlib "
         self.supportsCCACHE = False
-
-
-if CraftCore.compiler.isMinGW():
-    class Package(PackageMinGW):
-        def __init__(self):
-            PackageMinGW.__init__(self)
-else:
-    class Package(VirtualPackageBase):
-        def __init__(self):
-            VirtualPackageBase.__init__(self)
diff --git a/dev-utils/_windows/ccache/use_bundled_zlib.diff b/dev-utils/_windows/ccache/use_bundled_zlib.diff
deleted file mode 100644
index 9ce9422f..00000000
--- a/dev-utils/_windows/ccache/use_bundled_zlib.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index d3802d0..6cf23a6 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -16,7 +16,7 @@ LDFLAGS = @LDFLAGS@
- EXEEXT = @EXEEXT@
- RANLIB = @RANLIB@
- 
--libs = @LIBS@ -lz
-+libs = @LIBS@
- 
- base_sources = \
-     ccache.c mdfour.c hash.c execute.c util.c args.c stats.c version.c \
-diff --git a/configure.ac b/configure.ac
-index 2b92782..e610c74 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -69,30 +69,11 @@ HW_FUNC_ASPRINTF
- dnl Check if -lm is needed.
- AC_SEARCH_LIBS(cos, m)
- 
--dnl Check for zlib.
--AC_CACHE_CHECK(
--    [for zlib >= 1.2.3],
--    [ccache_cv_zlib_1_2_3],
--    AC_TRY_COMPILE(
--        [#include <zlib.h>],
--        [
--        #if (ZLIB_VERNUM >= 0x1230)
--        #else
--        #error "ZLIB_VERNUM < 0x1230"
--        #endif
--        ],
--        [ccache_cv_zlib_1_2_3=yes],
--        [ccache_cv_zlib_1_2_3=no]))
--AC_CHECK_LIB(z, gzdopen, true)
--if test $ccache_cv_zlib_1_2_3 = yes && test $ac_cv_lib_z_gzdopen = yes; then
--    use_bundled_zlib=no
--else
--    use_bundled_zlib=yes
--    extra_deps="zlib/libz.a"
--    CPPFLAGS="$CPPFLAGS -I\$(srcdir)/zlib"
--    LIBS="-Lzlib $LIBS"
--    mkdir -p zlib
--fi
-+use_bundled_zlib=yes
-+extra_deps="zlib/libz.a"
-+CPPFLAGS="$CPPFLAGS -I\$(srcdir)/zlib"
-+LIBS="zlib/libz.a $LIBS"
-+mkdir -p zlib
- 
- AC_C_INLINE
-