diff --git a/lib/OpenLayers/Layer/Google/v3.js b/lib/OpenLayers/Layer/Google/v3.js
index 9a49aefb39..fa9d64f960 100644
--- a/lib/OpenLayers/Layer/Google/v3.js
+++ b/lib/OpenLayers/Layer/Google/v3.js
@@ -181,22 +181,20 @@ OpenLayers.Layer.Google.v3 = {
      * visible - {Boolean} Display the GMap elements.
      */
     setGMapVisibility: function(visible) {
-        var type = this.type;
-        
-        var layers = this.map.getLayersByClass("OpenLayers.Layer.Google");
-        var index = OpenLayers.Util.indexOf(layers, this);
-        var layer;
-        for (var i=layers.length-1; i>=0; --i) {
-            layer = layers[i];
-            if (layer.visibility === true && layer.inRange === true) {
-                type = layer.type;
-                visible = true;
-                break;
-            }
-        }
-
         var cache = OpenLayers.Layer.Google.cache[this.map.id];
         if (cache) {
+            var type = this.type;
+            var layers = this.map.layers;
+            var layer;
+            for (var i=layers.length-1; i>=0; --i) {
+                layer = layers[i];
+                if (layer instanceof OpenLayers.Layer.Google &&
+                            layer.visibility === true && layer.inRange === true) {
+                    type = layer.type;
+                    visible = true;
+                    break;
+                }
+            }
             var container = this.mapObject.getDiv();
             if (visible === true) {
                 this.mapObject.setMapTypeId(type);