diff --git a/Demo-opengeode/build-script.sh b/Demo-opengeode/build-script.sh
index 6b4ba2954c95b49900384e0718d58d53d5214153..de599dce4bfa290f144d7aff6c902253bcd8cc6a 100755
--- a/Demo-opengeode/build-script.sh
+++ b/Demo-opengeode/build-script.sh
@@ -14,6 +14,9 @@
 # Note: TASTE will not overwrite your changes - if you need to update some parts
 #       you will have to merge the changes with the newly-created file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 if [ -z "$DEPLOYMENTVIEW" ]
 then
     DEPLOYMENTVIEW=DeploymentView.aadl
diff --git a/Demo_ABB/build-script.sh b/Demo_ABB/build-script.sh
index c34ea2dbb2989cd2a87393f911400342d494d4cc..6191413a344e145d38ea180126d0a0f52ade17d6 100755
--- a/Demo_ABB/build-script.sh
+++ b/Demo_ABB/build-script.sh
@@ -14,6 +14,9 @@
 # Note: TASTE will not overwrite your changes - if you need to update some  parts
 #       you will have to merge the changes with the newly-created "build-script.new.sh" file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 rm -f lift_model.zip
 zip lift_model lift_model/*
 [ ! -z "$CLEANUP" ] && rm -rf binary
diff --git a/Demo_ACN/build-script.sh b/Demo_ACN/build-script.sh
index 67e656bba2317b057f450e0a65953c4260add6f6..576effec7b74216038f17bcd0455d0c0e910ecb5 100755
--- a/Demo_ACN/build-script.sh
+++ b/Demo_ACN/build-script.sh
@@ -14,6 +14,10 @@
 # Note: TASTE will not overwrite your changes - if you need to update some parts
 #       you will have to merge the changes with the newly-created file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
+
 if [ -z "$DEPLOYMENTVIEW" ]
 then
     DEPLOYMENTVIEW=DeploymentView.aadl
diff --git a/Demo_Ada_GUI/build-script.sh b/Demo_Ada_GUI/build-script.sh
index f67040cd3daa420b828ba5c5021721f4e386b964..da869b1331cb8c16f63c9da012009840a8eccacc 100755
--- a/Demo_Ada_GUI/build-script.sh
+++ b/Demo_Ada_GUI/build-script.sh
@@ -14,6 +14,9 @@
 # Note: TASTE will not overwrite your changes - if you need to update some parts
 #       you will have to merge the changes with the newly-created file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 if [ -z "$DEPLOYMENTVIEW" ]
 then
     DEPLOYMENTVIEW=DeploymentView.aadl
diff --git a/Demo_Blackbox/build-script.sh b/Demo_Blackbox/build-script.sh
index 196b7b8abc0e8acf38c6a51a52611dd67a799f68..d23bbdb2f226d22b79a942a7252a20715d3b6a94 100755
--- a/Demo_Blackbox/build-script.sh
+++ b/Demo_Blackbox/build-script.sh
@@ -14,6 +14,9 @@
 # Note: TASTE will not overwrite your changes - if you need to update some  parts
 #       you will have to merge the changes with the newly-created "build-script.new.sh" file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 if [ -z "$DEPLOYMENTVIEW" ]
 then
     DEPLOYMENTVIEW=DeploymentView.aadl
diff --git a/Demo_Bright_Ascension/build-script.sh b/Demo_Bright_Ascension/build-script.sh
index a65747c52ab0c2ff5198d7603b406a2a92c433df..1b9577009e74fc5c72fe882091e6aaf920cbbb9d 100755
--- a/Demo_Bright_Ascension/build-script.sh
+++ b/Demo_Bright_Ascension/build-script.sh
@@ -14,6 +14,9 @@
 # Note: TASTE will not overwrite your changes - if you need to update some parts
 #       you will have to merge the changes with the newly-created file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 if [ -z "$DEPLOYMENTVIEW" ]
 then
     DEPLOYMENTVIEW=DeploymentView.aadl
diff --git a/Demo_C/build-script.sh b/Demo_C/build-script.sh
index fa0c079faa5618952d5c074019fc889266ac3c79..713de3fd07193f4583d59a4311ee878fcd8892f9 100755
--- a/Demo_C/build-script.sh
+++ b/Demo_C/build-script.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 rm -f simple_c_function.zip
 zip simple_c_function simple_c_function/*
 
diff --git a/Demo_CVProperties/build-script.sh b/Demo_CVProperties/build-script.sh
index fa339290b87ac7aea2f64aa36b476720c367311f..8070c6fcac97935f29c565ebf301b2f2fe902717 100755
--- a/Demo_CVProperties/build-script.sh
+++ b/Demo_CVProperties/build-script.sh
@@ -14,6 +14,9 @@
 # Note: TASTE will not overwrite your changes - if you need to update some parts
 #       you will have to merge the changes with the newly-created file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 if [ -z "$DEPLOYMENTVIEW" ]
 then
     DEPLOYMENTVIEW=DeploymentView.aadl
diff --git a/Demo_C_RTEMS/build-script.sh b/Demo_C_RTEMS/build-script.sh
index c470d7a312e15d381564e211eb984dd8f5fd110b..18376ae56df94a2e336826bbfaf05ba38bf3b1a2 100755
--- a/Demo_C_RTEMS/build-script.sh
+++ b/Demo_C_RTEMS/build-script.sh
@@ -11,6 +11,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:$C_INCLUDE_PATH
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 if [ -f user_init_pre.sh ]
 then
     echo [INFO] Executing user-defined init script
diff --git a/Demo_C_RTEMS_Gaisler/build-script.sh b/Demo_C_RTEMS_Gaisler/build-script.sh
index 78d95254db983771d1083942c9de874050f62e71..3a59b5da0a5860cd848d8c1d5c17bc4036e2576e 100755
--- a/Demo_C_RTEMS_Gaisler/build-script.sh
+++ b/Demo_C_RTEMS_Gaisler/build-script.sh
@@ -11,6 +11,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:$C_INCLUDE_PATH
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 if [ -f user_init_pre.sh ]
 then
     echo [INFO] Executing user-defined init script
diff --git a/Demo_ContextParams/build-script.sh b/Demo_ContextParams/build-script.sh
index 621820a8b211495c869bcc033304132c13bcc1ae..9822d21e5b99e52c462429e73169bb73ab1708da 100755
--- a/Demo_ContextParams/build-script.sh
+++ b/Demo_ContextParams/build-script.sh
@@ -13,6 +13,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:${C_INCLUDE_PATH}
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 CWD=$(pwd)
 
 if [ -t 1 ] ; then
diff --git a/Demo_Crazyflie_Blink/build-script.sh b/Demo_Crazyflie_Blink/build-script.sh
index f030afb2fab4c471bc1926a204f0a4f30c7dd889..98679f5b16a54af2e3be12b4422e64ccef5bb74d 100755
--- a/Demo_Crazyflie_Blink/build-script.sh
+++ b/Demo_Crazyflie_Blink/build-script.sh
@@ -11,6 +11,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:${C_INCLUDE_PATH}
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 CWD=$(pwd)
 
 if [ -t 0 ] ; then
diff --git a/Demo_Crazyflie_Communication/build-script.sh b/Demo_Crazyflie_Communication/build-script.sh
index b95bef5db1634c3797ecdd333aaa3242b2610f27..40463a2524b160064e72aaa3b4f60002aa02af93 100755
--- a/Demo_Crazyflie_Communication/build-script.sh
+++ b/Demo_Crazyflie_Communication/build-script.sh
@@ -13,6 +13,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:${C_INCLUDE_PATH}
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 CWD=$(pwd)
 
 if [ -t 0 ] ; then
diff --git a/Demo_Crazyflie_IMU/build-script.sh b/Demo_Crazyflie_IMU/build-script.sh
index e22fd7293289a42196f1decd63a452035147fbbe..22c000c17f98a86b2a2ae3ccfb793f672c9216a1 100755
--- a/Demo_Crazyflie_IMU/build-script.sh
+++ b/Demo_Crazyflie_IMU/build-script.sh
@@ -9,6 +9,10 @@
 
 # Inside these files you may set some environment variables:
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:${C_INCLUDE_PATH}
+
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 unset USE_POHIC   
 unset USE_POHIADA
 
diff --git a/Demo_Crazyflie_IMU_Height/build-script.sh b/Demo_Crazyflie_IMU_Height/build-script.sh
index 3f778ef453d8a070be151cda7f359233d71cec1b..ebd25063ad85c36dd85e2ba2bf162a6ad1564ea5 100755
--- a/Demo_Crazyflie_IMU_Height/build-script.sh
+++ b/Demo_Crazyflie_IMU_Height/build-script.sh
@@ -11,6 +11,10 @@
 
 # Inside these files you may set some environment variables:
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:${C_INCLUDE_PATH}
+
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 unset USE_POHIC   
 unset USE_POHIADA
 
diff --git a/Demo_Directives/build-script.sh b/Demo_Directives/build-script.sh
index 2a972cec70d3f29efbf760526b5e47e163de0c82..e083e91ccef1082454623ce17b7a4f7c555ae45d 100755
--- a/Demo_Directives/build-script.sh
+++ b/Demo_Directives/build-script.sh
@@ -13,6 +13,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:${C_INCLUDE_PATH}
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 CWD=$(pwd)
 
 if [ -t 1 ] ; then
diff --git a/Demo_Distrib/build-script.sh b/Demo_Distrib/build-script.sh
index fd20060d3efa19025516cc9fd3e679e299bb4bd8..460f3b7a243e0ef338df6506f4d20f1f2055b8c9 100755
--- a/Demo_Distrib/build-script.sh
+++ b/Demo_Distrib/build-script.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 cd skels
 rm -f a.zip
 zip a a/*
diff --git a/Demo_EmptySeq/build-script.sh b/Demo_EmptySeq/build-script.sh
index 7248ce30bc4110f51013ab7e373c5e2729cfb49f..a7c59d199bef0d756b4b5231b20ec271c55ea147 100755
--- a/Demo_EmptySeq/build-script.sh
+++ b/Demo_EmptySeq/build-script.sh
@@ -14,6 +14,9 @@
 # Note: TASTE will not overwrite your changes - if you need to update some parts
 #       you will have to merge the changes with the newly-created file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 if [ -z "$DEPLOYMENTVIEW" ]
 then
     DEPLOYMENTVIEW=DeploymentView.aadl
diff --git a/Demo_Eth_GR740_to_PC/build-script.sh b/Demo_Eth_GR740_to_PC/build-script.sh
index 8f8bc5f63fd4aeb28ebf950de60876e433b89ede..32a8a770930531bbf3afeb0bd10a40a18f82fd45 100755
--- a/Demo_Eth_GR740_to_PC/build-script.sh
+++ b/Demo_Eth_GR740_to_PC/build-script.sh
@@ -13,6 +13,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:${C_INCLUDE_PATH}
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 CWD=$(pwd)
 
 if [ -t 1 ] ; then
diff --git a/Demo_ExternalLib/build-script.sh b/Demo_ExternalLib/build-script.sh
index 09be278443628b314728e4039e0c889b0fbd4a60..be2426de8b28ea4da73af1d85182a848bf4399d0 100755
--- a/Demo_ExternalLib/build-script.sh
+++ b/Demo_ExternalLib/build-script.sh
@@ -15,6 +15,10 @@
 #       you will have to merge the changes with the newly-created file.
 
 # clean first to make sure it is build on the host platform
+
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 make -C contrib/ || exit 1
 
 if [ -z "$DEPLOYMENTVIEW" ]
diff --git a/Demo_ImportedComponent/build-script.sh b/Demo_ImportedComponent/build-script.sh
index 20983c6a9375d366e12166e3e7a692a4b2098dec..610a6073fbbfff6ec04bebb6a7d4fb4fdd10464a 100755
--- a/Demo_ImportedComponent/build-script.sh
+++ b/Demo_ImportedComponent/build-script.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 rm -f a.zip
 zip a a/*
 rm -f b.zip
diff --git a/Demo_KeepCase/build-script.sh b/Demo_KeepCase/build-script.sh
index f6580cbc93dcc36c9d6ebf06f28c9180f4397a42..adfb9155a9572a199b88f08c4a449586b327f1b4 100755
--- a/Demo_KeepCase/build-script.sh
+++ b/Demo_KeepCase/build-script.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 rm -f hello.zip
 zip hello hello/*
 rm -f world.zip
diff --git a/Demo_ManyThreads/build-script.sh b/Demo_ManyThreads/build-script.sh
index 4850f87114ea95851230995ded6cc329be605230..3abf88ba70dd111df72ccf0f51e5133c0ee90995 100755
--- a/Demo_ManyThreads/build-script.sh
+++ b/Demo_ManyThreads/build-script.sh
@@ -14,6 +14,9 @@
 # Note: TASTE will not overwrite your changes - if you need to update some parts
 #       you will have to merge the changes with the newly-created file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 if [ -z "$DEPLOYMENTVIEW" ]
 then
     DEPLOYMENTVIEW=DeploymentView.aadl
diff --git a/Demo_MessageOrdering/build-script.sh b/Demo_MessageOrdering/build-script.sh
index 576e44efb045f6f0c77cd930297bf4b6fb7fe550..e650e2e48dd7c138e993ee91e9b8330c5d7c69fb 100755
--- a/Demo_MessageOrdering/build-script.sh
+++ b/Demo_MessageOrdering/build-script.sh
@@ -14,6 +14,9 @@
 # Note: TASTE will not overwrite your changes - if you need to update some  parts
 #       you will have to merge the changes with the newly-created "build-script.new.sh" file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 rm -f f1.zip
 zip f1 f1/*
 rm -f f2.zip
diff --git a/Demo_Mix/build-sample.sh b/Demo_Mix/build-sample.sh
index 01e6ab10afcba166ff65ddb3b8a6ce7de4b308c6..222f812068bec4f2a8675fb0aced16456a655c5e 100755
--- a/Demo_Mix/build-sample.sh
+++ b/Demo_Mix/build-sample.sh
@@ -14,6 +14,9 @@
 # Note: TASTE will not overwrite your changes - if you need to update some parts
 #       you will have to merge the changes with the newly-created file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 if [ -z "$DEPLOYMENTVIEW" ]
 then
     DEPLOYMENTVIEW=DeploymentView.aadl
diff --git a/Demo_MultiPlatform/build-script.sh b/Demo_MultiPlatform/build-script.sh
index 7162ce6a00537cd70fa74b7f47bf95cd9b3fdf04..cc25ffa949066b85791f134d1db9132685800f22 100755
--- a/Demo_MultiPlatform/build-script.sh
+++ b/Demo_MultiPlatform/build-script.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 cd skels
 rm -f pinger.zip
 zip pinger pinger/*
diff --git a/Demo_Multi_Instances/build-script.sh b/Demo_Multi_Instances/build-script.sh
index eb6ba66c9cfccd282cba456a0f522ec1f2f2abef..d27d1a4e60eba85179e9575cf417f32c9ad86be5 100755
--- a/Demo_Multi_Instances/build-script.sh
+++ b/Demo_Multi_Instances/build-script.sh
@@ -13,6 +13,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:${C_INCLUDE_PATH}
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 CWD=$(pwd)
 
 if [ -t 1 ] ; then
diff --git a/Demo_Opengeode_Simple_Nested_States/build-script.sh b/Demo_Opengeode_Simple_Nested_States/build-script.sh
index 7cef98f056a3737a210183edf2acc2b250116959..f3352d5f5e193088b8bdd04787913de8b402726a 100755
--- a/Demo_Opengeode_Simple_Nested_States/build-script.sh
+++ b/Demo_Opengeode_Simple_Nested_States/build-script.sh
@@ -14,6 +14,9 @@
 # Note: TASTE will not overwrite your changes - if you need to update some parts
 #       you will have to merge the changes with the newly-created file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 if [ -z "$DEPLOYMENTVIEW" ]
 then
     DEPLOYMENTVIEW=DeploymentView.aadl
diff --git a/Demo_PeekPoke_Linux/build-script.sh b/Demo_PeekPoke_Linux/build-script.sh
index 9966c4aa9fb65e061e451e62fd225c156915613a..53348eaf0474bf364c4cac33996dc30c9f84e8ca 100755
--- a/Demo_PeekPoke_Linux/build-script.sh
+++ b/Demo_PeekPoke_Linux/build-script.sh
@@ -13,6 +13,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:${C_INCLUDE_PATH}
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 CWD=$(pwd)
 
 if [ -t 1 ] ; then
diff --git a/Demo_PortNames/build-script.sh b/Demo_PortNames/build-script.sh
index a6eb4f0c2807aa4e714384c5fe5a87feb71d200f..3d73cb7610bff673523641c1630869d662f30824 100755
--- a/Demo_PortNames/build-script.sh
+++ b/Demo_PortNames/build-script.sh
@@ -14,6 +14,9 @@
 # Note: TASTE will not overwrite your changes - if you need to update some  parts
 #       you will have to merge the changes with the newly-created "build-script.new.sh" file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 rm -f function0.zip
 zip function0 function0/*
 rm -f function1.zip
diff --git a/Demo_RI_Names/build-script.sh b/Demo_RI_Names/build-script.sh
index 8fa5feb7191d4276cfc607b00756c05f4c058359..7c7a13a29ba36386f924608508be4d7d21af31c9 100755
--- a/Demo_RI_Names/build-script.sh
+++ b/Demo_RI_Names/build-script.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 rm -f a.zip
 zip a a/*
 rm -f b.zip
diff --git a/Demo_RTDS_SyncC/build-script.sh b/Demo_RTDS_SyncC/build-script.sh
index 3d669e66fa276cf832bd1589848be10f0c9da30f..dcfa1df1d750c8380112898accfcfa2bb7cc4a4a 100755
--- a/Demo_RTDS_SyncC/build-script.sh
+++ b/Demo_RTDS_SyncC/build-script.sh
@@ -13,6 +13,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:${C_INCLUDE_PATH}
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 CWD=$(pwd)
 
 if [ -t 1 ] ; then
diff --git a/Demo_RTEMS_Ada/build-script.sh b/Demo_RTEMS_Ada/build-script.sh
index a66df7082ac1b19394a20c1460ed017c345e55c7..8c4eb72d057be75e5b3ca482e9bf721f4469a03b 100755
--- a/Demo_RTEMS_Ada/build-script.sh
+++ b/Demo_RTEMS_Ada/build-script.sh
@@ -11,6 +11,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:$C_INCLUDE_PATH
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 if [ -f user_init_pre.sh ]
 then
     echo [INFO] Executing user-defined init script
diff --git a/Demo_RTEMS_SDL/build-script.sh b/Demo_RTEMS_SDL/build-script.sh
index 7aee6f6d64cf38044fc70bd7c474ec72a2944e35..24f242a7f9aa73583d3277ba4bb31ea24370f9ab 100755
--- a/Demo_RTEMS_SDL/build-script.sh
+++ b/Demo_RTEMS_SDL/build-script.sh
@@ -13,6 +13,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:${C_INCLUDE_PATH}
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 CWD=$(pwd)
 
 if [ -t 1 ] ; then
diff --git a/Demo_SQL_Socket_Linux32/build-script.sh b/Demo_SQL_Socket_Linux32/build-script.sh
index 814c53a2c6b698c629acc28167e227d03e830929..c8a5d73b0c1683e1f71eb4f43e48ab46e420271d 100755
--- a/Demo_SQL_Socket_Linux32/build-script.sh
+++ b/Demo_SQL_Socket_Linux32/build-script.sh
@@ -14,6 +14,9 @@
 # Note: TASTE will not overwrite your changes - if you need to update some parts
 #       you will have to merge the changes with the newly-created file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 if [ -z "$DEPLOYMENTVIEW" ]
 then
     DEPLOYMENTVIEW=DeploymentView.aadl
diff --git a/Demo_Serial_N2X/build-script.sh b/Demo_Serial_N2X/build-script.sh
index bd7885ef43acb6e366140a368e61f81e4d3e591c..fa05263e1566bb464169fd7a440737be998712d0 100755
--- a/Demo_Serial_N2X/build-script.sh
+++ b/Demo_Serial_N2X/build-script.sh
@@ -13,6 +13,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:${C_INCLUDE_PATH}
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 CWD=$(pwd)
 
 if [ -t 1 ] ; then
diff --git a/Demo_Simulink_C_NoStopBlock/build-script.sh b/Demo_Simulink_C_NoStopBlock/build-script.sh
index 21662d879815a297978677cbd9c0f4f0f45e82a4..5c63a4933460b2721dc26b630c5c9f4589ad8a9b 100755
--- a/Demo_Simulink_C_NoStopBlock/build-script.sh
+++ b/Demo_Simulink_C_NoStopBlock/build-script.sh
@@ -14,6 +14,9 @@
 # Note: TASTE will not overwrite your changes - if you need to update some  parts
 #       you will have to merge the changes with the newly-created "build-script.new.sh" file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 rm -f my_c_function.zip
 zip my_c_function my_c_function/*
 rm -f my_simulink_function.zip
diff --git a/Demo_Simulink_C_StopBlock/build-script.sh b/Demo_Simulink_C_StopBlock/build-script.sh
index 9696683a16b5d146eec412834b2259e8e37dae0d..2ee3a3b6407ac3a06315db63e866da76ad349d1e 100755
--- a/Demo_Simulink_C_StopBlock/build-script.sh
+++ b/Demo_Simulink_C_StopBlock/build-script.sh
@@ -14,6 +14,9 @@
 # Note: TASTE will not overwrite your changes - if you need to update some  parts
 #       you will have to merge the changes with the newly-created "build-script.new.sh" file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 rm -f my_c_function.zip
 zip my_c_function my_c_function/*
 rm -f my_simulink_function.zip
diff --git a/Demo_Sockets/build-script.sh b/Demo_Sockets/build-script.sh
index aa83bced4008e0d588a6cbd4940f6497d7d88385..145b71a320393ba07cfd52fa75affd1378caa6e9 100755
--- a/Demo_Sockets/build-script.sh
+++ b/Demo_Sockets/build-script.sh
@@ -14,6 +14,9 @@
 # Note: TASTE will not overwrite your changes - if you need to update some  parts
 #       you will have to merge the changes with the newly-created "build-script.new.sh" file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 rm -f function0.zip
 zip function0 function0/*
 rm -f function1.zip
diff --git a/Demo_Sockets_SDL_GUI/build-script.sh b/Demo_Sockets_SDL_GUI/build-script.sh
index 3ee284c736957cd433b14686a398f042fa5ff8f7..61c687d7b3f96974d390d3211c98388c6c465e64 100755
--- a/Demo_Sockets_SDL_GUI/build-script.sh
+++ b/Demo_Sockets_SDL_GUI/build-script.sh
@@ -14,6 +14,9 @@
 # Note: TASTE will not overwrite your changes - if you need to update some parts
 #       you will have to merge the changes with the newly-created file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 if [ -z "$DEPLOYMENTVIEW" ]
 then
     DEPLOYMENTVIEW=DeploymentView.aadl
diff --git a/Demo_Sockets_x86/build-script.sh b/Demo_Sockets_x86/build-script.sh
index dbe7e99f0c6dc0386c9ca60e42d88d4a150e6d35..70d3d761ddd0736803a2492a61d058e0f7d4de7e 100755
--- a/Demo_Sockets_x86/build-script.sh
+++ b/Demo_Sockets_x86/build-script.sh
@@ -14,6 +14,9 @@
 # Note: TASTE will not overwrite your changes - if you need to update some  parts
 #       you will have to merge the changes with the newly-created "build-script.new.sh" file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 rm -f a.zip
 zip a a/*
 rm -f b.zip
diff --git a/Demo_SpaceWire_2RASTA/build-script.sh b/Demo_SpaceWire_2RASTA/build-script.sh
index bbcd230124a55bc769f61ce900b2f9a5488c95ef..0add5960bc502b5c1bfe2c938db24752bcef88f0 100755
--- a/Demo_SpaceWire_2RASTA/build-script.sh
+++ b/Demo_SpaceWire_2RASTA/build-script.sh
@@ -11,6 +11,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:$C_INCLUDE_PATH
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 CWD=$(pwd)
 
 if [ -t 0 ] ; then
diff --git a/Demo_SpaceWire_N2X/build-script.sh b/Demo_SpaceWire_N2X/build-script.sh
index bd7885ef43acb6e366140a368e61f81e4d3e591c..fa05263e1566bb464169fd7a440737be998712d0 100755
--- a/Demo_SpaceWire_N2X/build-script.sh
+++ b/Demo_SpaceWire_N2X/build-script.sh
@@ -13,6 +13,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:${C_INCLUDE_PATH}
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 CWD=$(pwd)
 
 if [ -t 1 ] ; then
diff --git a/Demo_Timers/build-script.sh b/Demo_Timers/build-script.sh
index 6f90dabeeebec36a30721ab992302b3d420d1fe0..c8a9ad0d68ac29a1141c28012b5d8d89785436b3 100755
--- a/Demo_Timers/build-script.sh
+++ b/Demo_Timers/build-script.sh
@@ -11,6 +11,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:$C_INCLUDE_PATH
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 CWD=$(pwd)
 
 if [ -f user_init_pre.sh ]
diff --git a/Demo_TwoCallers/build-script.sh b/Demo_TwoCallers/build-script.sh
index 8e1179a033dcbe8ba5bf991f03cf15b41c41c9f5..f98344ad0d4df00c975c39d6434bb929d989017f 100755
--- a/Demo_TwoCallers/build-script.sh
+++ b/Demo_TwoCallers/build-script.sh
@@ -13,6 +13,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:${C_INCLUDE_PATH}
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 CWD=$(pwd)
 
 if [ -t 1 ] ; then
diff --git a/Demo_Unprotected/build-script.sh b/Demo_Unprotected/build-script.sh
index 9824d120546b29c38133065f8a061adef80cfbc6..32e56553fe5d42e9176c27949b9d03a9c50181ee 100755
--- a/Demo_Unprotected/build-script.sh
+++ b/Demo_Unprotected/build-script.sh
@@ -14,6 +14,9 @@
 # Note: TASTE will not overwrite your changes - if you need to update some parts
 #       you will have to merge the changes with the newly-created file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 if [ -z "$DEPLOYMENTVIEW" ]
 then
     DEPLOYMENTVIEW=DeploymentView.aadl
diff --git a/Demo_checkSMP/build-script.sh b/Demo_checkSMP/build-script.sh
index d3d44ab0f7f20ece89744320d924dec7879da0ac..1733b2376944cf7251953e103f0b7d5497bc860a 100755
--- a/Demo_checkSMP/build-script.sh
+++ b/Demo_checkSMP/build-script.sh
@@ -13,6 +13,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:${C_INCLUDE_PATH}
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 CWD=$(pwd)
 
 if [ -t 1 ] ; then
diff --git a/Demo_uPy_Basic/build-script.sh b/Demo_uPy_Basic/build-script.sh
index d4fdccad8d37dbd97b3cd9be8eaeabaec8848ac3..78465a215588b9efc04127d72bb4bb1307694030 100755
--- a/Demo_uPy_Basic/build-script.sh
+++ b/Demo_uPy_Basic/build-script.sh
@@ -13,6 +13,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:${C_INCLUDE_PATH}
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 CWD=$(pwd)
 
 if [ -t 1 ] ; then
diff --git a/Demo_uPy_Basic_RTEMS412_Leon3/build-script.sh b/Demo_uPy_Basic_RTEMS412_Leon3/build-script.sh
index d4fdccad8d37dbd97b3cd9be8eaeabaec8848ac3..78465a215588b9efc04127d72bb4bb1307694030 100755
--- a/Demo_uPy_Basic_RTEMS412_Leon3/build-script.sh
+++ b/Demo_uPy_Basic_RTEMS412_Leon3/build-script.sh
@@ -13,6 +13,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:${C_INCLUDE_PATH}
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 CWD=$(pwd)
 
 if [ -t 1 ] ; then
diff --git a/Demo_uPy_TypesPI/build-script.sh b/Demo_uPy_TypesPI/build-script.sh
index af12ab2cf121c3a65189681a49265a2c84da26f2..f8a1f109987f1e500d1beb387d3ebd24b65f9617 100755
--- a/Demo_uPy_TypesPI/build-script.sh
+++ b/Demo_uPy_TypesPI/build-script.sh
@@ -13,6 +13,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:${C_INCLUDE_PATH}
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 CWD=$(pwd)
 
 if [ -t 1 ] ; then
diff --git a/Demo_uPy_TypesRI/build-script.sh b/Demo_uPy_TypesRI/build-script.sh
index 79652623e76fba1a169b7e2523c142d0a8e3a927..07debd82b11de061a01585d37d9e856b79781a02 100755
--- a/Demo_uPy_TypesRI/build-script.sh
+++ b/Demo_uPy_TypesRI/build-script.sh
@@ -13,6 +13,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:${C_INCLUDE_PATH}
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 CWD=$(pwd)
 
 if [ -t 1 ] ; then
diff --git a/Demo_uPy_WithC/build-script.sh b/Demo_uPy_WithC/build-script.sh
index af12ab2cf121c3a65189681a49265a2c84da26f2..f8a1f109987f1e500d1beb387d3ebd24b65f9617 100755
--- a/Demo_uPy_WithC/build-script.sh
+++ b/Demo_uPy_WithC/build-script.sh
@@ -13,6 +13,9 @@
 #    C_INCLUDE_PATH=/usr/include/xenomai/analogy/:${C_INCLUDE_PATH}
 #    unset USE_POHIC   
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 CWD=$(pwd)
 
 if [ -t 1 ] ; then
diff --git a/Demo_vcd/build-script.sh b/Demo_vcd/build-script.sh
index 7df3cf419ddac97a5ad8ae819879a39db4c949ac..e9dc610016063d0217b4d4d5638e3aea16460765 100755
--- a/Demo_vcd/build-script.sh
+++ b/Demo_vcd/build-script.sh
@@ -14,6 +14,9 @@
 # Note: TASTE will not overwrite your changes - if you need to update some parts
 #       you will have to merge the changes with the newly-created file.
 
+mkdir -p .cache
+export PROJECT_CACHE=$(pwd)/.cache
+
 if [ -z "$DEPLOYMENTVIEW" ]
 then
     DEPLOYMENTVIEW=DeploymentView.aadl