Merge "Fix type hints in objectcache related classes"