Merge "Suppress warnings about non parameterized generic type in StarCache"