Merge "Added missing field definition, added cache key check and fixed type hint"