Merge "Add cache validation to ensure the validity"