diff --git a/src/app/core/auth/auth-response-parsing.service.spec.ts b/src/app/core/auth/auth-response-parsing.service.spec.ts
index 138d0f1be3..5b94d8e69a 100644
--- a/src/app/core/auth/auth-response-parsing.service.spec.ts
+++ b/src/app/core/auth/auth-response-parsing.service.spec.ts
@@ -11,7 +11,7 @@ import { ObjectCacheState } from '../cache/object-cache.reducer';
 describe('AuthResponseParsingService', () => {
   let service: AuthResponseParsingService;
 
-  const EnvConfig = { cache: { msToLive: 1000 } } as GlobalConfig;
+  const EnvConfig = { cache: { msToLive: 1000 } } as any;
   const store = new MockStore<ObjectCacheState>({});
   const objectCacheService = new ObjectCacheService(store as any);
 
diff --git a/src/app/core/cache/object-cache.reducer.spec.ts b/src/app/core/cache/object-cache.reducer.spec.ts
index 311f11c2ad..4e383a82e4 100644
--- a/src/app/core/cache/object-cache.reducer.spec.ts
+++ b/src/app/core/cache/object-cache.reducer.spec.ts
@@ -8,6 +8,7 @@ import {
   RemoveFromObjectCacheAction,
   ResetObjectCacheTimestampsAction
 } from './object-cache.actions';
+import { Operation } from 'fast-json-patch';
 
 class NullAction extends RemoveFromObjectCacheAction {
   type = null;
@@ -21,6 +22,7 @@ class NullAction extends RemoveFromObjectCacheAction {
 describe('objectCacheReducer', () => {
   const selfLink1 = 'https://localhost:8080/api/core/items/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
   const selfLink2 = 'https://localhost:8080/api/core/items/28b04544-1766-4e82-9728-c4e93544ecd3';
+  const newName = 'new different name';
   const testState = {
     [selfLink1]: {
       data: {
@@ -140,15 +142,31 @@ describe('objectCacheReducer', () => {
   });
 
   it('should perform the ADD_PATCH action without affecting the previous state', () => {
-    const action = new AddPatchObjectCacheAction(selfLink1, [{ op: 'replace', path: '/name', value: 'random string' }]);
+    const action = new AddPatchObjectCacheAction(selfLink1, [{
+      op: 'replace',
+      path: '/name',
+      value: 'random string'
+    }]);
     // testState has already been frozen above
     objectCacheReducer(testState, action);
   });
 
-  it('should perform the APPLY_PATCH action without affecting the previous state', () => {
+  it('should when the ADD_PATCH action dispatched', () => {
+    const patch = [{ op: 'add', path: '/name', value: newName } as Operation];
+    const action = new AddPatchObjectCacheAction(selfLink1, patch);
+    const newState = objectCacheReducer(testState, action);
+    expect(newState[selfLink1].patches.map((p) => p.operations)).toContain(patch);
+  });
+
+  it('should when the APPLY_PATCH action dispatched', () => {
+    const patch = [{ op: 'add', path: '/name', value: newName } as Operation];
+    const addPatchAction = new AddPatchObjectCacheAction(selfLink1, patch);
+    const stateWithPatch = objectCacheReducer(testState, addPatchAction);
+
     const action = new ApplyPatchObjectCacheAction(selfLink1);
-    // testState has already been frozen above
-    objectCacheReducer(testState, action);
+    const newState = objectCacheReducer(stateWithPatch, action);
+    expect(newState[selfLink1].patches).toEqual([]);
+    expect((newState[selfLink1].data as any).name).toEqual(newName);
   });
 
 });
diff --git a/src/app/core/cache/server-sync-buffer.effects.ts b/src/app/core/cache/server-sync-buffer.effects.ts
index db2263c52a..5a0a5527d1 100644
--- a/src/app/core/cache/server-sync-buffer.effects.ts
+++ b/src/app/core/cache/server-sync-buffer.effects.ts
@@ -1,4 +1,4 @@
-import { delay, exhaustMap, first, map, switchMap } from 'rxjs/operators';
+import { delay, exhaustMap, first, map, switchMap, tap } from 'rxjs/operators';
 import { Inject, Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import {
@@ -38,7 +38,9 @@ export class ServerSyncBufferEffects {
       exhaustMap((action: AddToSSBAction) => {
         const autoSyncConfig = this.EnvConfig.cache.autoSync;
         const timeoutInSeconds = autoSyncConfig.timePerMethod[action.payload.method] || autoSyncConfig.defaultTime;
-        return observableOf(new CommitSSBAction(action.payload.method)).pipe(delay(timeoutInSeconds * 1000))
+        return observableOf(new CommitSSBAction(action.payload.method)).pipe(
+          delay(timeoutInSeconds * 1000),
+        )
       })
     );
 
@@ -54,6 +56,7 @@ export class ServerSyncBufferEffects {
       switchMap((action: CommitSSBAction) => {
         return this.store.pipe(
           select(serverSyncBufferSelector()),
+          first(), /* necessary, otherwise delay will not have any effect after the first run */
           switchMap((bufferState: ServerSyncBufferState) => {
             const actions: Array<Observable<Action>> = bufferState.buffer
               .filter((entry: ServerSyncBufferEntry) => {