69826664 implement caching master

[#69826664]