diff --git a/modules/ingest-geoip/build.gradle b/modules/ingest-geoip/build.gradle
index f2dec9cd7b7..7b0f4a83e91 100644
--- a/modules/ingest-geoip/build.gradle
+++ b/modules/ingest-geoip/build.gradle
@@ -41,9 +41,6 @@ task copyDefaultGeoIp2DatabaseFiles(type: Copy) {
 
 project.bundlePlugin.dependsOn(copyDefaultGeoIp2DatabaseFiles)
 
-compileJava.options.compilerArgs << "-Xlint:-rawtypes,-unchecked,-serial"
-compileTestJava.options.compilerArgs << "-Xlint:-rawtypes,-unchecked"
-
 bundlePlugin {
   from("${project.buildDir}/ingest-geoip") {
     into '/'
diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java
index 8769a643e1d..a170b441773 100644
--- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java
+++ b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java
@@ -171,14 +171,14 @@ public class IngestGeoIpPlugin extends Plugin implements IngestPlugin, Closeable
      * reduction of CPU usage.
      */
     static class GeoIpCache {
-        private final Cache<CacheKey, AbstractResponse> cache;
+        private final Cache<CacheKey<?>, AbstractResponse> cache;
 
         //package private for testing
         GeoIpCache(long maxSize) {
             if (maxSize < 0) {
                 throw new IllegalArgumentException("geoip max cache size must be 0 or greater");
             }
-            this.cache = CacheBuilder.<CacheKey, AbstractResponse>builder().setMaximumWeight(maxSize).build();
+            this.cache = CacheBuilder.<CacheKey<?>, AbstractResponse>builder().setMaximumWeight(maxSize).build();
         }
 
         <T extends AbstractResponse> T putIfAbsent(InetAddress ip, Class<T> responseType,