Fix PageCache: async rendering of blocks can corrupt layout cache

Refactored original solution, implemented cache keys for layout to be able to generate different unique cache ids also based on possibly added cache keys

Author: adrian-martinez-interactiv4