Move updating of current cache to worker
Merge remote-tracking branch 'upstream/develop' into PLFM-2751
merge and unit tests
Merge pull request #1331 from marcel-blonk/PLFM-2751

Move updating of cache to worker