Fixing layerName, caching gridSet