diff --git a/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Simple.pm b/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Simple.pm
index 3464e6690..4fe88bc70 100644
--- a/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Simple.pm
+++ b/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Simple.pm
@@ -1044,9 +1044,16 @@ sub run ($$) {
     $class->lmSetApacheUser( $apacheRequest, $datas->{$whatToTrace} );
 
     # AUTHORIZATION
+    my $kc = keys %$datas;
     return $class->forbidden($uri) unless ( $class->grant($uri) );
     $class->updateStatus( $datas->{$whatToTrace}, $apacheRequest->uri, 'OK' );
 
+    # Store local macros
+    if ( keys %$datas > $kc and $refLocalStorage ) {
+        $class->lmLog("Update local cache","debug");
+        $refLocalStorage->set( $id, $datas, "10 minutes" );
+    }
+
     # ACCOUNTING
     # 2 - Inform remote application
     $class->sendHeaders;