diff --git a/controllers/toolchaincluster/healthchecker.go b/controllers/toolchainclustercache/healthchecker.go
similarity index 99%
rename from controllers/toolchaincluster/healthchecker.go
rename to controllers/toolchainclustercache/healthchecker.go
index 46945308..bd1dab3c 100644
--- a/controllers/toolchaincluster/healthchecker.go
+++ b/controllers/toolchainclustercache/healthchecker.go
@@ -1,4 +1,4 @@
-package toolchaincluster
+package toolchainclustercache
 
 import (
 	"context"
diff --git a/controllers/toolchaincluster/healthchecker_test.go b/controllers/toolchainclustercache/healthchecker_test.go
similarity index 99%
rename from controllers/toolchaincluster/healthchecker_test.go
rename to controllers/toolchainclustercache/healthchecker_test.go
index c7c088bc..422e19db 100644
--- a/controllers/toolchaincluster/healthchecker_test.go
+++ b/controllers/toolchainclustercache/healthchecker_test.go
@@ -1,4 +1,4 @@
-package toolchaincluster
+package toolchainclustercache
 
 import (
 	"context"
diff --git a/controllers/toolchaincluster/toolchaincluster_controller.go b/controllers/toolchainclustercache/toolchaincluster_cache_controller.go
similarity index 96%
rename from controllers/toolchaincluster/toolchaincluster_controller.go
rename to controllers/toolchainclustercache/toolchaincluster_cache_controller.go
index 4be49b6f..9adb8fbb 100644
--- a/controllers/toolchaincluster/toolchaincluster_controller.go
+++ b/controllers/toolchainclustercache/toolchaincluster_cache_controller.go
@@ -1,4 +1,4 @@
-package toolchaincluster
+package toolchainclustercache
 
 import (
 	"context"
@@ -46,7 +46,7 @@ type Reconciler struct {
 // The Controller will requeue the Request to be processed again if the returned error is non-nil or
 // Result.Requeue is true, otherwise upon completion it will remove the work from the queue.
 func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.Result, error) {
-	reqLogger := log.FromContext(ctx)
+	reqLogger := log.FromContext(ctx).WithName("cache")
 	reqLogger.Info("Reconciling ToolchainCluster")
 
 	// Fetch the ToolchainCluster instance
diff --git a/controllers/toolchaincluster/toolchaincluster_controller_test.go b/controllers/toolchainclustercache/toolchaincluster_cache_controller_test.go
similarity index 99%
rename from controllers/toolchaincluster/toolchaincluster_controller_test.go
rename to controllers/toolchainclustercache/toolchaincluster_cache_controller_test.go
index fa56780e..42a8bd5d 100644
--- a/controllers/toolchaincluster/toolchaincluster_controller_test.go
+++ b/controllers/toolchainclustercache/toolchaincluster_cache_controller_test.go
@@ -1,4 +1,4 @@
-package toolchaincluster
+package toolchainclustercache
 
 import (
 	"context"