Merge "[COMMON] Fix genericKV cache generation"