diff --git a/modules/cache/main.tf b/modules/cache/main.tf
index 17dc07ad3..5d0dd3843 100644
--- a/modules/cache/main.tf
+++ b/modules/cache/main.tf
@@ -63,7 +63,9 @@ resource "aws_s3_bucket" "build_cache" {
 
 # block public access to S3 cache bucket
 resource "aws_s3_bucket_public_access_block" "build_cache_policy" {
-  bucket = local.cache_bucket_name
+  count = var.create_cache_bucket ? 1 : 0
+
+  bucket = aws_s3_bucket.build_cache[0].id
 
   block_public_acls       = true
   block_public_policy     = true