diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
index 304e524ecd..46a8b07733 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
@@ -247,6 +247,9 @@ Foam::GAMGAgglomeration::GAMGAgglomeration
 
     maxLevels_(50),
 
+    updateInterval_(controlDict.getOrDefault<label>("updateInterval", 1)),
+    requireUpdate_(false),
+
     nCellsInCoarsestLevel_
     (
         controlDict.getOrDefault<label>("nCellsInCoarsestLevel", 10)
@@ -313,6 +316,12 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
 
     if (agglomPtr)
     {
+        if (agglomPtr->requireUpdate_)
+        {
+            mesh.thisDb().checkOut(const_cast<GAMGAgglomeration*>(agglomPtr));
+            return GAMGAgglomeration::New(mesh, controlDict);
+        }
+
         return *agglomPtr;
     }
 
@@ -369,6 +378,12 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
 
     if (agglomPtr)
     {
+        if (agglomPtr->requireUpdate_)
+        {
+            mesh.thisDb().checkOut(const_cast<GAMGAgglomeration*>(agglomPtr));
+            return GAMGAgglomeration::New(matrix, controlDict);
+        }
+
         return *agglomPtr;
     }
 
@@ -421,6 +436,12 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
 
     if (agglomPtr)
     {
+        if (agglomPtr->requireUpdate_)
+        {
+            mesh.thisDb().checkOut(const_cast<GAMGAgglomeration*>(agglomPtr));
+            return GAMGAgglomeration::New(mesh, controlDict);
+        }
+
         return *agglomPtr;
     }
 
@@ -476,6 +497,25 @@ Foam::GAMGAgglomeration::~GAMGAgglomeration()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+bool Foam::GAMGAgglomeration::requiresUpdate() const
+{
+    return
+        (updateInterval_ > 0)
+     && ((mesh_.thisDb().time().timeIndex() % updateInterval_) == 0);
+}
+
+
+bool Foam::GAMGAgglomeration::movePoints()
+{
+    if (requiresUpdate())
+    {
+        requireUpdate_ = true;
+    }
+    // What to return?
+    return requireUpdate_;
+}
+
+
 const Foam::lduMesh& Foam::GAMGAgglomeration::meshLevel
 (
     const label i
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
index 8fdd75235f..e45d70b5a7 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
@@ -30,6 +30,26 @@ Class
 Description
     Geometric agglomerated algebraic multigrid agglomeration class.
 
+    Example of the specification in fvSolution:
+    \verbatim
+    {
+        solver              GAMG;
+        smoother            symGaussSeidel;
+
+        // Whether to cache the agglomeration
+        cacheAgglomeration  yes;
+        // Optionally update every updateInterval mesh motion. Default is 1.
+        updateInterval      10;
+
+        // Optionally agglomerate coarsest-level across processors
+        processorAgglomerator   masterCoarsest;
+        nMasters            2;
+
+        tolerance       1e-2;
+        relTol          0;
+    }
+    \endverbatim
+
 SourceFiles
     GAMGAgglomeration.C
     GAMGAgglomerationTemplates.C
@@ -65,14 +85,14 @@ class GAMGProcAgglomeration;
 
 class GAMGAgglomeration
 :
-    public MeshObject<lduMesh, GeometricMeshObject, GAMGAgglomeration>
+    public MeshObject<lduMesh, MoveableMeshObject, GAMGAgglomeration>
 {
     // Private Typedefs
 
         typedef MeshObject
         <
             lduMesh,
-            GeometricMeshObject,
+            MoveableMeshObject,
             GAMGAgglomeration
         > MeshObject_type;
 
@@ -84,6 +104,12 @@ protected:
         //- Max number of levels
         const label maxLevels_;
 
+        //- Update agglomeration every updateInterval_ steps
+        const label updateInterval_;
+
+        //- Does agglomeration require update
+        mutable bool requireUpdate_;
+
         //- Number of cells in coarsest level
         label nCellsInCoarsestLevel_;
 
@@ -161,6 +187,9 @@ protected:
 
     // Protected Member Functions
 
+        //- Does the agglomeration need to be fully updated?
+        bool requiresUpdate() const;
+
         //- Assemble coarse mesh addressing
         void agglomerateLduAddressing(const label fineLevelIndex);
 
@@ -335,6 +364,10 @@ public:
 
     // Member Functions
 
+            //- Update when the mesh moves
+            virtual bool movePoints();
+
+
         // Access
 
             label size() const
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/algebraicPairGAMGAgglomeration/algebraicPairGAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/algebraicPairGAMGAgglomeration/algebraicPairGAMGAgglomeration.C
index 7a38913e93..875edf95f4 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/algebraicPairGAMGAgglomeration/algebraicPairGAMGAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/algebraicPairGAMGAgglomeration/algebraicPairGAMGAgglomeration.C
@@ -29,6 +29,8 @@ License
 #include "algebraicPairGAMGAgglomeration.H"
 #include "lduMatrix.H"
 #include "addToRunTimeSelectionTable.H"
+//#include "cyclicAMILduInterface.H"
+//#include "cyclicACMILduInterface.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -72,4 +74,208 @@ Foam::algebraicPairGAMGAgglomeration::algebraicPairGAMGAgglomeration
 }
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::algebraicPairGAMGAgglomeration::movePoints()
+{
+    const bool ok = pairGAMGAgglomeration::movePoints();
+
+    if (!requireUpdate_)
+    {
+        // TBD. For now commented out since cyclicAMI not known in this library.
+
+/*
+        // movePoints lower down did not trigger update. Update in case of
+        // cyclicAMI since contains addressing across patches and patches
+        // have moved.
+
+        bool hasCyclicAMI = false;
+        if (!processorAgglomerate())
+        {
+            const auto& fineInterfaces = interfaceLevel(0);
+            forAll(fineInterfaces, inti)
+            {
+                if (fineInterfaces.set(inti))
+                {
+                    const auto& intf = fineInterfaces[inti];
+                    if
+                    (
+                        isA<cyclicAMILduInterface>(intf)
+                     || isA<cyclicACMILduInterface>(intf)
+                    )
+                    {
+                        hasCyclicAMI = true;
+
+                        DebugPoutInFunction
+                            << "Detected cyclicA(C)MI at interface " << inti
+                            << ".Redoing patch agglomeration" << endl;
+
+                        break;
+                    }
+                }
+            }
+        }
+
+
+        if (hasCyclicAMI)
+        {
+            // Redo the interface agglomeration
+            for
+            (
+                label fineLevelIndex = 0;
+                fineLevelIndex < size();
+                fineLevelIndex++
+            )
+            {
+                // Near complete copy of boundary handling in
+                // GAMGAgglomeration::agglomerateLduAddressing
+
+                const auto& fineMesh = meshLevel(fineLevelIndex);
+                const auto& fineInterfaces = interfaceLevel(fineLevelIndex);
+                const lduAddressing& fineMeshAddr = fineMesh.lduAddr();
+
+                // Get restriction map for current level
+                const labelField& restrictMap =
+                    restrictAddressing(fineLevelIndex);
+
+                const label startOfRequests = UPstream::nRequests();
+                forAll(fineInterfaces, inti)
+                {
+                    if (fineInterfaces.set(inti))
+                    {
+                        const auto& intf = fineInterfaces[inti];
+
+                        if
+                        (
+                            isA<cyclicAMILduInterface>(intf)
+                         || isA<cyclicACMILduInterface>(intf)
+                        )
+                        {
+                            if (fineLevelIndex == 0)
+                            {
+                                intf.initInternalFieldTransfer
+                                (
+                                    Pstream::commsTypes::nonBlocking,
+                                    restrictMap,
+                                    fineMeshAddr.patchAddr(inti)
+                                );
+                            }
+                            else
+                            {
+                                intf.initInternalFieldTransfer
+                                (
+                                    Pstream::commsTypes::nonBlocking,
+                                    restrictMap
+                                );
+                            }
+                        }
+                    }
+                }
+
+                // Wait for comms to finised
+                UPstream::waitRequests(startOfRequests);
+
+                // New coarse-level interfaces
+                //lduInterfacePtrsList coarseInterfaces(fineInterfaces.size());
+
+                forAll(fineInterfaces, inti)
+                {
+                    if (fineInterfaces.set(inti))
+                    {
+                        const auto& intf = fineInterfaces[inti];
+
+                        if
+                        (
+                            isA<cyclicAMILduInterface>(intf)
+                         || isA<cyclicACMILduInterface>(intf)
+                        )
+                        {
+                            tmp<labelField> restrictMapInternalField;
+
+                            // The finest mesh uses patchAddr from the
+                            // original lduAdressing.
+                            // the coarser levels create thei own adressing for
+                            // faceCells
+                            if (fineLevelIndex == 0)
+                            {
+                                restrictMapInternalField =
+                                    intf.interfaceInternalField
+                                    (
+                                        restrictMap,
+                                        fineMeshAddr.patchAddr(inti)
+                                    );
+                            }
+                            else
+                            {
+                                restrictMapInternalField =
+                                    intf.interfaceInternalField
+                                    (
+                                        restrictMap
+                                    );
+                            }
+
+                            tmp<labelField> nbrRestrictMapInternalField =
+                                intf.internalFieldTransfer
+                                (
+                                    Pstream::commsTypes::nonBlocking,
+                                    restrictMap
+                                );
+
+                            lduPrimitiveMesh& coarseMesh =
+                                meshLevels_[fineLevelIndex];
+
+                            autoPtr<GAMGInterface> coarseIntf
+                            (
+                                GAMGInterface::New
+                                (
+                                    inti,
+                                    coarseMesh.rawInterfaces(),
+                                    intf,
+                                    restrictMapInternalField(),
+                                    nbrRestrictMapInternalField(),
+                                    fineLevelIndex,
+                                    fineMesh.comm()
+                                )
+                            );
+
+                            //coarseInterfaces.set(inti, coarseIntf.ptr());
+                            coarseMesh.interfaces().set
+                            (
+                                inti,
+                                coarseIntf.ptr()
+                            );
+                            coarseMesh.primitiveInterfaces().set
+                            (
+                                inti,
+                               &coarseMesh.interfaces()[inti]
+                            );
+                        }
+                    }
+                }
+
+                //meshLevels_[fineLevelIndex].addInterfaces
+                //(
+                //    coarseInterfaces,
+                //    lduPrimitiveMesh::nonBlockingSchedule
+                //    <
+                //        processorGAMGInterface
+                //    >
+                //    (
+                //        coarseInterfaces
+                //    )
+                //);
+            }
+        }
+
+        if (debug)
+        {
+            printLevels();
+        }
+*/
+    }
+
+    return ok;
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/algebraicPairGAMGAgglomeration/algebraicPairGAMGAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/algebraicPairGAMGAgglomeration/algebraicPairGAMGAgglomeration.H
index 765c34d045..ccead62846 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/algebraicPairGAMGAgglomeration/algebraicPairGAMGAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/algebraicPairGAMGAgglomeration/algebraicPairGAMGAgglomeration.H
@@ -67,6 +67,12 @@ public:
             const lduMatrix& matrix,
             const dictionary& controlDict
         );
+
+
+    // Member Functions
+
+        //- Update when the mesh moves
+        virtual bool movePoints();
 };
 
 
diff --git a/src/finiteVolume/fvMatrices/solvers/GAMGSymSolver/GAMGAgglomerations/faceAreaPairGAMGAgglomeration/faceAreaPairGAMGAgglomeration.C b/src/finiteVolume/fvMatrices/solvers/GAMGSymSolver/GAMGAgglomerations/faceAreaPairGAMGAgglomeration/faceAreaPairGAMGAgglomeration.C
index 1254794ee7..e0e50e9fdd 100644
--- a/src/finiteVolume/fvMatrices/solvers/GAMGSymSolver/GAMGAgglomerations/faceAreaPairGAMGAgglomeration/faceAreaPairGAMGAgglomeration.C
+++ b/src/finiteVolume/fvMatrices/solvers/GAMGSymSolver/GAMGAgglomerations/faceAreaPairGAMGAgglomeration/faceAreaPairGAMGAgglomeration.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
+    Copyright (C) 2023-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,6 +30,9 @@ License
 #include "fvMesh.H"
 #include "surfaceFields.H"
 #include "addToRunTimeSelectionTable.H"
+#include "cyclicAMIGAMGInterface.H"
+#include "cyclicACMIGAMGInterface.H"
+//#include "processorGAMGInterface.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -65,23 +68,47 @@ Foam::faceAreaPairGAMGAgglomeration::faceAreaPairGAMGAgglomeration
 {
     const fvMesh& fvmesh = refCast<const fvMesh>(mesh);
 
-    //agglomerate(mesh, sqrt(fvmesh.magSf().primitiveField()));
-    agglomerate
-    (
-        nCellsInCoarsestLevel_,
-        0,          //mesh,
-        mag
+    if (pairGAMGAgglomeration::requiresUpdate())
+    {
+        // This is the <=2406 logic. Apply perturbation to avoid jagged
+        // agglomerations on axis-aligned meshes
+
+        DebugPoutInFunction<< "Agglomerate with perturbation" << endl;
+
+        //agglomerate(mesh, sqrt(fvmesh.magSf().primitiveField()));
+        agglomerate
         (
-            cmptMultiply
+            nCellsInCoarsestLevel_,
+            0,          //mesh,
+            mag
             (
-                fvmesh.Sf().primitiveField()
-               /sqrt(fvmesh.magSf().primitiveField()),
-                vector(1, 1.01, 1.02)
-                //vector::one
-            )
-        ),
-        true
-    );
+                cmptMultiply
+                (
+                    fvmesh.Sf().primitiveField()
+                   /sqrt(fvmesh.magSf().primitiveField()),
+                    vector(1, 1.01, 1.02)
+                    //vector::one
+                )
+            ),
+            true
+        );
+    }
+    else
+    {
+        // In partial updating mode. Use Galilean invariant agglomeration
+        // to e.g. have constant agglomeration for solid body rotation. Also
+        // scale with face area to be consistent with (most) discretisation.
+
+        DebugPoutInFunction<< "Agglomerate with faceArea magnitude" << endl;
+
+        agglomerate
+        (
+            nCellsInCoarsestLevel_,
+            0,          //mesh,
+            mag(fvmesh.magSf().primitiveField()),
+            true
+        );
+    }
 }
 
 
@@ -95,23 +122,247 @@ Foam::faceAreaPairGAMGAgglomeration::faceAreaPairGAMGAgglomeration
 :
     pairGAMGAgglomeration(mesh, controlDict)
 {
-    //agglomerate(mesh, sqrt(mag(faceAreas)));
-    agglomerate
-    (
-        nCellsInCoarsestLevel_,
-        0,          //mesh,
-        mag
+    if (pairGAMGAgglomeration::requiresUpdate())
+    {
+        // This is the <=2406 logic. Apply perturbation to avoid jagged
+        // agglomerations on axis-aligned meshes
+
+        DebugPoutInFunction<< "Agglomerate with perturbation" << endl;
+
+        //agglomerate(mesh, sqrt(mag(faceAreas)));
+        agglomerate
         (
-            cmptMultiply
+            nCellsInCoarsestLevel_,
+            0,          //mesh,
+            mag
             (
-                faceAreas
-               /sqrt(mag(faceAreas)),
-                vector(1, 1.01, 1.02)
-                //vector::one
+                cmptMultiply
+                (
+                    faceAreas
+                   /sqrt(mag(faceAreas)),
+                    vector(1, 1.01, 1.02)
+                    //vector::one
+                )
+            ),
+            true
+        );
+    }
+    else
+    {
+        // In partial updating mode. Use Galilean invariant agglomeration
+        // to e.g. have constant agglomeration for solid body rotation. Also
+        // scale with face area to be consistent with (most) discretisation.
+
+        DebugPoutInFunction<< "Agglomerate with faceArea magnitude" << endl;
+
+        agglomerate
+        (
+            nCellsInCoarsestLevel_,
+            0,          //mesh,
+            mag(faceAreas),
+            true
+        );
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::faceAreaPairGAMGAgglomeration::movePoints()
+{
+    const bool ok = pairGAMGAgglomeration::movePoints();
+
+    if (!requireUpdate_)
+    {
+        // movePoints lower down did not trigger update. Update in case of
+        // cyclicAMI since contains addressing across patches and patches
+        // have moved.
+
+        bool hasCyclicAMI = false;
+        if (!processorAgglomerate())
+        {
+            const auto& fineInterfaces = interfaceLevel(0);
+            forAll(fineInterfaces, inti)
+            {
+                if (fineInterfaces.set(inti))
+                {
+                    const auto& intf = fineInterfaces[inti];
+                    if
+                    (
+                        isA<cyclicAMILduInterface>(intf)
+                     || isA<cyclicACMILduInterface>(intf)
+                    )
+                    {
+                        hasCyclicAMI = true;
+
+                        DebugPoutInFunction
+                            << "Detected cyclicA(C)MI at interface " << inti
+                            << ".Redoing patch agglomeration" << endl;
+
+                        break;
+                    }
+                }
+            }
+        }
+
+
+        if (hasCyclicAMI)
+        {
+            // Redo the interface agglomeration
+            for
+            (
+                label fineLevelIndex = 0;
+                fineLevelIndex < size();
+                fineLevelIndex++
             )
-        ),
-        true
-    );
+            {
+                // Near complete copy of boundary handling in
+                // GAMGAgglomeration::agglomerateLduAddressing
+
+                const auto& fineMesh = meshLevel(fineLevelIndex);
+                const auto& fineInterfaces = interfaceLevel(fineLevelIndex);
+                const lduAddressing& fineMeshAddr = fineMesh.lduAddr();
+
+                // Get restriction map for current level
+                const labelField& restrictMap =
+                    restrictAddressing(fineLevelIndex);
+
+                const label startOfRequests = UPstream::nRequests();
+                forAll(fineInterfaces, inti)
+                {
+                    if (fineInterfaces.set(inti))
+                    {
+                        const auto& intf = fineInterfaces[inti];
+
+                        if
+                        (
+                            isA<cyclicAMILduInterface>(intf)
+                         || isA<cyclicACMILduInterface>(intf)
+                        )
+                        {
+                            if (fineLevelIndex == 0)
+                            {
+                                intf.initInternalFieldTransfer
+                                (
+                                    Pstream::commsTypes::nonBlocking,
+                                    restrictMap,
+                                    fineMeshAddr.patchAddr(inti)
+                                );
+                            }
+                            else
+                            {
+                                intf.initInternalFieldTransfer
+                                (
+                                    Pstream::commsTypes::nonBlocking,
+                                    restrictMap
+                                );
+                            }
+                        }
+                    }
+                }
+
+                // Wait for comms to finised
+                UPstream::waitRequests(startOfRequests);
+
+                // New coarse-level interfaces
+                //lduInterfacePtrsList coarseInterfaces(fineInterfaces.size());
+
+                forAll(fineInterfaces, inti)
+                {
+                    if (fineInterfaces.set(inti))
+                    {
+                        const auto& intf = fineInterfaces[inti];
+
+                        if
+                        (
+                            isA<cyclicAMILduInterface>(intf)
+                         || isA<cyclicACMILduInterface>(intf)
+                        )
+                        {
+                            tmp<labelField> restrictMapInternalField;
+
+                            // The finest mesh uses patchAddr from the
+                            // original lduAdressing.
+                            // the coarser levels create thei own adressing for
+                            // faceCells
+                            if (fineLevelIndex == 0)
+                            {
+                                restrictMapInternalField =
+                                    intf.interfaceInternalField
+                                    (
+                                        restrictMap,
+                                        fineMeshAddr.patchAddr(inti)
+                                    );
+                            }
+                            else
+                            {
+                                restrictMapInternalField =
+                                    intf.interfaceInternalField
+                                    (
+                                        restrictMap
+                                    );
+                            }
+
+                            tmp<labelField> nbrRestrictMapInternalField =
+                                intf.internalFieldTransfer
+                                (
+                                    Pstream::commsTypes::nonBlocking,
+                                    restrictMap
+                                );
+
+                            lduPrimitiveMesh& coarseMesh =
+                                meshLevels_[fineLevelIndex];
+
+                            autoPtr<GAMGInterface> coarseIntf
+                            (
+                                GAMGInterface::New
+                                (
+                                    inti,
+                                    coarseMesh.rawInterfaces(),
+                                    intf,
+                                    restrictMapInternalField(),
+                                    nbrRestrictMapInternalField(),
+                                    fineLevelIndex,
+                                    fineMesh.comm()
+                                )
+                            );
+
+                            //coarseInterfaces.set(inti, coarseIntf.ptr());
+                            coarseMesh.interfaces().set
+                            (
+                                inti,
+                                coarseIntf.ptr()
+                            );
+                            coarseMesh.primitiveInterfaces().set
+                            (
+                                inti,
+                               &coarseMesh.interfaces()[inti]
+                            );
+                        }
+                    }
+                }
+
+                //meshLevels_[fineLevelIndex].addInterfaces
+                //(
+                //    coarseInterfaces,
+                //    lduPrimitiveMesh::nonBlockingSchedule
+                //    <
+                //        processorGAMGInterface
+                //    >
+                //    (
+                //        coarseInterfaces
+                //    )
+                //);
+            }
+        }
+
+        if (debug)
+        {
+            printLevels();
+        }
+    }
+
+    return ok;
 }
 
 
diff --git a/src/finiteVolume/fvMatrices/solvers/GAMGSymSolver/GAMGAgglomerations/faceAreaPairGAMGAgglomeration/faceAreaPairGAMGAgglomeration.H b/src/finiteVolume/fvMatrices/solvers/GAMGSymSolver/GAMGAgglomerations/faceAreaPairGAMGAgglomeration/faceAreaPairGAMGAgglomeration.H
index 6854459fc1..5446e09256 100644
--- a/src/finiteVolume/fvMatrices/solvers/GAMGSymSolver/GAMGAgglomerations/faceAreaPairGAMGAgglomeration/faceAreaPairGAMGAgglomeration.H
+++ b/src/finiteVolume/fvMatrices/solvers/GAMGSymSolver/GAMGAgglomerations/faceAreaPairGAMGAgglomeration/faceAreaPairGAMGAgglomeration.H
@@ -76,6 +76,12 @@ public:
             const vectorField& faceAreas,
             const dictionary& controlDict
         );
+
+
+    // Member Functions
+
+        //- Update when the mesh moves
+        virtual bool movePoints();
 };
 
 
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/fvSolution
index 53fb43fe48..dbcb984ae5 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/fvSolution
@@ -22,8 +22,8 @@ solvers
         tolerance       1e-2;
         relTol          0;
         smoother        GaussSeidel;
-        //cacheAgglomeration no;    // keep agglom during pimple
-        maxIter         50;
+        cacheAgglomeration yes; // Store agglomeration
+        updateInterval  -1;     // Never redo agglomeration
     }
 
     p
diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/system/fvSolution
index ab37579ca2..17b8e74737 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletPeriodicAMI2D/system/fvSolution
@@ -22,7 +22,6 @@ solvers
         tolerance       1e-2;
         relTol          0;
         smoother        GaussSeidel;
-        cacheAgglomeration no;
         nCellsInCoarsestLevel 10;
         agglomerator    faceAreaPair;
         mergeLevels     1;
diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/fvSolution b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/fvSolution
index 54df5d11db..a7bfaf22b5 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/fvSolution
@@ -22,7 +22,6 @@ solvers
         tolerance       1e-2;
         relTol          0;
         smoother        DICGaussSeidel;
-        cacheAgglomeration no;
         maxIter         50;
     }
 
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/fvSolution
index 4611f766d7..b784f74aff 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/fvSolution
@@ -22,7 +22,6 @@ solvers
         tolerance       1e-8;
         relTol          0;
         smoother        GaussSeidel;
-        cacheAgglomeration no;
     }
 
     pFinal
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/fvSolution
index 4da2098812..3ec7efb2a8 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/fvSolution
@@ -22,7 +22,6 @@ solvers
         tolerance       1e-8;
         relTol          0;
         smoother        GaussSeidel;
-        cacheAgglomeration no;
     }
 
     pFinal
diff --git a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/fvSolution
index 1eb49059ec..6082fc5372 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/filmPanel0/system/fvSolution
@@ -21,7 +21,6 @@ solvers
     {
         solver          GAMG;
         smoother        GaussSeidel;
-        cacheAgglomeration no;
 
         tolerance        0.02;
         relTol           0;
diff --git a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/fvSolution
index 2baf590a30..980c839c65 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/inclinedPlaneFilm/system/fvSolution
@@ -20,9 +20,8 @@ solvers
     {
         solver          GAMG;
         smoother        GaussSeidel;
-        cacheAgglomeration no;
-        tolerance        0.02;
-        relTol           0;
+        tolerance       0.02;
+        relTol          0;
     }
 
     p
diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/fvSolution
index f11ca8090a..868d5a4508 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/mixerVesselAMI2D/system/fvSolution
@@ -20,9 +20,8 @@ solvers
     {
         solver          GAMG;
         smoother        GaussSeidel;
-        cacheAgglomeration no;
-        tolerance        0.02;
-        relTol           0;
+        tolerance       0.02;
+        relTol          0;
     }
 
     p
diff --git a/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSolution
index 37028c4871..da5f708374 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/movingCone/system/fvSolution
@@ -22,7 +22,6 @@ solvers
         tolerance       0;
         relTol          0.01;
         smoother        GaussSeidel;
-        cacheAgglomeration no;
     }
 
     pFinal
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/fvSolution
index ede960268b..4fb5928c07 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/fvSolution
@@ -22,7 +22,6 @@ solvers
         tolerance       1e-8;
         relTol          0;
         smoother        GaussSeidel;
-        cacheAgglomeration no;
     }
 
     pFinal
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/fvSolution b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/fvSolution
index 44573cbcf5..b87e948cb0 100644
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/fvSolution
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/fvSolution
@@ -22,7 +22,6 @@ solvers
         tolerance       1e-2;
         relTol          0;
         smoother        DICGaussSeidel;
-        cacheAgglomeration no;
         nCellsInCoarsestLevel 10;
         agglomerator    faceAreaPair;
         mergeLevels     1;
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSolution b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSolution
index 978b4b1fbf..60e4035941 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSolution
@@ -37,7 +37,6 @@ solvers
             tolerance       1e-05;
             relTol          0;
             smoother        DICGaussSeidel;
-            cacheAgglomeration no;
         }
 
         tolerance       1e-05;
diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSolution b/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSolution
index 18465840b1..4e94dfb684 100644
--- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSolution
@@ -41,7 +41,6 @@ solvers
             tolerance       1e-5;
             relTol          0;
             smoother        DICGaussSeidel;
-            cacheAgglomeration no;
         }
         tolerance       1e-05;
         relTol          0;
diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSolution b/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSolution
index d3f479f917..03a7e22175 100644
--- a/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSolution
+++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSolution
@@ -40,7 +40,6 @@ solvers
         nPreSweeps      0;
         nPostSweeps     2;
         nFinestSweeps   2;
-        cacheAgglomeration false;
         nCellsInCoarsestLevel 10;
         agglomerator    faceAreaPair;
         mergeLevels     1;
diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSolution
index 87b0763826..5864783755 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSolution
@@ -29,7 +29,6 @@ solvers
         tolerance       1e-08;
         relTol          0.01;
         smoother        DIC;
-        cacheAgglomeration no;
     }
 
     p_rghFinal
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution
index acbf012904..22464e949c 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution
@@ -32,7 +32,6 @@ solvers
             tolerance       1e-05;
             relTol          0;
             smoother        DICGaussSeidel;
-            cacheAgglomeration no;
         }
 
         tolerance       1e-05;
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution
index acbf012904..22464e949c 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution
@@ -32,7 +32,6 @@ solvers
             tolerance       1e-05;
             relTol          0;
             smoother        DICGaussSeidel;
-            cacheAgglomeration no;
         }
 
         tolerance       1e-05;
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution
index 8408ee358f..51b9a79296 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution
@@ -32,7 +32,6 @@ solvers
             tolerance       1e-05;
             relTol          0;
             smoother        DICGaussSeidel;
-            cacheAgglomeration no;
         }
 
         tolerance       1e-05;
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution
index 8408ee358f..51b9a79296 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution
@@ -32,7 +32,6 @@ solvers
             tolerance       1e-05;
             relTol          0;
             smoother        DICGaussSeidel;
-            cacheAgglomeration no;
         }
 
         tolerance       1e-05;
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution
index 8408ee358f..51b9a79296 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution
@@ -32,7 +32,6 @@ solvers
             tolerance       1e-05;
             relTol          0;
             smoother        DICGaussSeidel;
-            cacheAgglomeration no;
         }
 
         tolerance       1e-05;
diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution
index b38259ebdf..516ac7c973 100644
--- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution
@@ -32,7 +32,6 @@ solvers
             tolerance       1e-05;
             relTol          0;
             smoother        DICGaussSeidel;
-            cacheAgglomeration no;
         }
 
         tolerance       1e-05;
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSolution
index 076b2e692b..a181348735 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSolution
@@ -22,7 +22,6 @@ solvers
         tolerance       1e-5;
         relTol          0;
         smoother        GaussSeidel;
-        cacheAgglomeration false;
         nCellsInCoarsestLevel 10;
         agglomerator    faceAreaPair;
         mergeLevels     1;
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSolution
index 358dbd4166..0802af0646 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSolution
@@ -22,7 +22,6 @@ solvers
         tolerance       1e-5;
         relTol          0;
         smoother        GaussSeidel;
-        cacheAgglomeration false;
         nCellsInCoarsestLevel 10;
         agglomerator    faceAreaPair;
         mergeLevels     1;
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSolution
index 358dbd4166..0802af0646 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSolution
@@ -22,7 +22,6 @@ solvers
         tolerance       1e-5;
         relTol          0;
         smoother        GaussSeidel;
-        cacheAgglomeration false;
         nCellsInCoarsestLevel 10;
         agglomerator    faceAreaPair;
         mergeLevels     1;
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSolution
index 076b2e692b..a181348735 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSolution
@@ -22,7 +22,6 @@ solvers
         tolerance       1e-5;
         relTol          0;
         smoother        GaussSeidel;
-        cacheAgglomeration false;
         nCellsInCoarsestLevel 10;
         agglomerator    faceAreaPair;
         mergeLevels     1;
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSolution
index be135ed7f5..3af8878097 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSolution
@@ -22,7 +22,6 @@ solvers
         tolerance       1e-5;
         relTol          0;
         smoother        GaussSeidel;
-        cacheAgglomeration false;
         nCellsInCoarsestLevel 10;
         agglomerator    faceAreaPair;
         mergeLevels     1;
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/fvSolution
index 7c463b3fe4..9b6b468242 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/fvSolution
@@ -39,7 +39,6 @@ solvers
         tolerance       1e-08;
         relTol          0.01;
         smoother        DIC;
-        cacheAgglomeration no;
     }
 
     p_rghFinal
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSolution
index 89c4eacb80..fb1eaee820 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSolution
@@ -38,7 +38,6 @@ solvers
             tolerance       1e-05;
             relTol          0;
             smoother        DICGaussSeidel;
-            cacheAgglomeration no;
         }
 
         tolerance       1e-05;
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
index d791d62b3e..9dfcdca230 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution
@@ -39,7 +39,6 @@ solvers
         tolerance       1e-2;
         relTol          0;
         smoother        DICGaussSeidel;
-        cacheAgglomeration no;
         maxIter         50;
     }
 
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSolution
index 32f4a5cdd0..34edc9f71f 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSolution
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSolution
@@ -44,7 +44,6 @@ solvers
             nPreSweeps      0;
             nPostSweeps     2;
             nFinestSweeps   2;
-            cacheAgglomeration false;
             nCellsInCoarsestLevel 10;
             agglomerator    faceAreaPair;
             mergeLevels     1;
@@ -63,7 +62,6 @@ solvers
         nPreSweeps      0;
         nPostSweeps     2;
         nFinestSweeps   2;
-        cacheAgglomeration true;
         nCellsInCoarsestLevel 10;
         agglomerator    faceAreaPair;
         mergeLevels     1;
@@ -82,7 +80,6 @@ solvers
             nPreSweeps      2;
             nPostSweeps     2;
             nFinestSweeps   2;
-            cacheAgglomeration true;
             nCellsInCoarsestLevel 10;
             agglomerator    faceAreaPair;
             mergeLevels     1;
diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSolution
index 6f0eeaeddf..9ecb2ababf 100644
--- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSolution
+++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSolution
@@ -44,7 +44,6 @@ solvers
             nPreSweeps      0;
             nPostSweeps     2;
             nFinestSweeps   2;
-            cacheAgglomeration false;
             nCellsInCoarsestLevel 10;
             agglomerator    faceAreaPair;
             mergeLevels     1;
@@ -63,7 +62,6 @@ solvers
         nPreSweeps      0;
         nPostSweeps     2;
         nFinestSweeps   2;
-        cacheAgglomeration true;
         nCellsInCoarsestLevel 10;
         agglomerator    faceAreaPair;
         mergeLevels     1;
@@ -82,7 +80,6 @@ solvers
             nPreSweeps      2;
             nPostSweeps     2;
             nFinestSweeps   2;
-            cacheAgglomeration true;
             nCellsInCoarsestLevel 10;
             agglomerator    faceAreaPair;
             mergeLevels     1;