*** empty log message ***
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEState.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEState.java
index f2960d2..7e41779 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEState.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEState.java
@@ -112,7 +112,7 @@
 		
 		createTargetModels();
 		
-		if (fResolve && workspace.length > 0 && !fNewState) {
+		if (fResolve && workspace.length > 0 && !fNewState && !"true".equals(System.getProperty("pde.nocache"))) {
 			readWorkspaceState();
 		}
 		
@@ -590,7 +590,7 @@
 	public void shutdown() {
 		IPluginModelBase[] models = PDECore.getDefault().getModelManager().getWorkspaceModels();
 		long timestamp = 0;
-		if (shouldSaveState(models)) {
+		if (!"true".equals(System.getProperty("pde.nocache")) && shouldSaveState(models)) {
 			timestamp = computeTimestamp(models);
 			File dir = new File(DIR, Long.toString(timestamp) + ".workspace");
 			State state = stateObjectFactory.createState();