diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Project.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Project.java
index 7828865e2a93..1c0fe86c4a2e 100644
--- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Project.java
+++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Project.java
@@ -18,7 +18,6 @@
 package io.ballerina.projects;
 
 import io.ballerina.projects.environment.ProjectEnvironment;
-import org.wso2.ballerinalang.compiler.PackageCache;
 import org.wso2.ballerinalang.compiler.util.CompilerContext;
 import org.wso2.ballerinalang.compiler.util.CompilerOptions;
 
@@ -36,7 +35,7 @@ public abstract class Project {
     protected final Path sourceRoot;
     private Package currentPackage;
     private BuildOptions buildOptions;
-    private final ProjectEnvironment projectEnvironment;
+    private ProjectEnvironment projectEnvironment;
     private final ProjectKind projectKind;
 
     protected Project(ProjectKind projectKind,
@@ -112,10 +111,7 @@ protected void populateCompilerContext() {
      */
     public void clearCaches() {
         cloneProject(this);
-        CompilerContext compilerContext = this.projectEnvironmentContext()
-                .getService(CompilerContext.class);
-        PackageCache packageCache = PackageCache.getInstance(compilerContext);
-        packageCache.flush();
+        this.projectEnvironment = ProjectEnvironmentBuilder.getDefaultBuilder().build(this);
     }
 
     /**