diff --git a/cmd/deploy.go b/cmd/deploy.go
index 110d62ace5..c3bf9fc162 100644
--- a/cmd/deploy.go
+++ b/cmd/deploy.go
@@ -118,6 +118,9 @@ func (cmd *DeployCmd) Run(cobraCmd *cobra.Command, args []string) error {
 		return err
 	}
 
+	// Clear the dependencies & deployments cache if necessary
+	clearCache(generatedConfig, client)
+
 	// Deprecated: Fill DEVSPACE_DOMAIN vars
 	err = fillDevSpaceDomainVars(client, generatedConfig)
 	if err != nil {
@@ -260,3 +263,12 @@ func fillDevSpaceDomainVars(client kubectl.Client, generatedConfig *generated.Co
 
 	return nil
 }
+
+func clearCache(generatedConfig *generated.Config, client kubectl.Client) {
+	if generatedConfig.GetActive().LastContext != nil {
+		if (generatedConfig.GetActive().LastContext.Context != "" && generatedConfig.GetActive().LastContext.Context != client.CurrentContext()) || (generatedConfig.GetActive().LastContext.Namespace != "" && generatedConfig.GetActive().LastContext.Namespace != client.Namespace()) {
+			generatedConfig.GetActive().Deployments = map[string]*generated.DeploymentCache{}
+			generatedConfig.GetActive().Dependencies = map[string]string{}
+		}
+	}
+}
diff --git a/cmd/dev.go b/cmd/dev.go
index 8a6646aa48..6e153da94c 100644
--- a/cmd/dev.go
+++ b/cmd/dev.go
@@ -159,6 +159,9 @@ func (cmd *DevCmd) Run(cobraCmd *cobra.Command, args []string) error {
 		return err
 	}
 
+	// Clear the dependencies & deployments cache if necessary
+	clearCache(generatedConfig, client)
+
 	// Deprecated: Fill DEVSPACE_DOMAIN vars
 	err = fillDevSpaceDomainVars(client, generatedConfig)
 	if err != nil {