Merge pull request #1331 from marcel-blonk/PLFM-2751

Move updating of cache to worker