diff --git a/includes/common.php b/includes/common.php
index b32b46a263..e19d0160f4 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -800,6 +800,28 @@ function enable_graphs($device, &$graph_enable)
     enable_os_graphs($device['os'], $graph_enable);
 }
 
+//
+// maintain a simple cache of objects
+//
+
+function object_add_cache($section, $obj)
+{
+    global $object_cache;
+    $object_cache[$section][$obj] = true;
+}
+
+
+function object_is_cached($section, $obj)
+{
+    global $object_cache;
+    if (array_key_exists($obj, $object_cache)) {
+        return $object_cache[$obj];
+    }
+    else {
+        return false;
+    }
+}
+
 /**
  * Checks if config allows us to ping this device
  * $attribs contains an array of all of this devices
@@ -812,9 +834,6 @@ function can_ping_device($attribs) {
     if ($config['icmp_check'] === true && $attribs['override_icmp_disable'] != "true") {
         return true;
     }
-    else {
-        return false;
-    }
 } // end can_ping_device
 
 /**
diff --git a/includes/discovery/discovery-arp.inc.php b/includes/discovery/discovery-arp.inc.php
index fd5442b062..6894e0cc65 100644
--- a/includes/discovery/discovery-arp.inc.php
+++ b/includes/discovery/discovery-arp.inc.php
@@ -60,12 +60,12 @@ foreach (dbFetchRows($sql, array($deviceid)) as $entry) {
     }
 
     // Attempt discovery of each IP only once per run.
-    if (arp_discovery_is_cached($ip)) {
+    if (object_is_cached('arp_discovery', $ip)) {
         echo '.';
         continue;
     }
 
-    arp_discovery_add_cache($ip);
+    object_add_cache('arp_discovery', $ip);
 
     $name = gethostbyaddr($ip);
     echo '+';
diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php
index a90a65d41e..af421323bf 100644
--- a/includes/discovery/functions.inc.php
+++ b/includes/discovery/functions.inc.php
@@ -704,25 +704,3 @@ function discover_process_ipv6(&$valid, $ifIndex, $ipv6_address, $ipv6_prefixlen
     }//end if
 
 }//end discover_process_ipv6()
-
-
-// maintain a simple cache of seen IPs during ARP discovery
-
-
-function arp_discovery_add_cache($ip) {
-    global $arp_discovery;
-    $arp_discovery[$ip] = true;
-
-}//end arp_discovery_add_cache()
-
-
-function arp_discovery_is_cached($ip) {
-    global $arp_discovery;
-    if (array_key_exists($ip, $arp_discovery)) {
-        return $arp_discovery[$ip];
-    }
-    else {
-        return false;
-    }
-
-}//end arp_discovery_is_cached()