1 files changed, 5 insertions, 2 deletions
diff --git a/src/mbgl/tile/vector_tile_data.cpp b/src/mbgl/tile/vector_tile_data.cpp
index 926e596080..d53f1deba6 100644
--- a/src/mbgl/tile/vector_tile_data.cpp
+++ b/src/mbgl/tile/vector_tile_data.cpp
@@ -26,8 +26,11 @@ optional<Value> VectorTileFeature::getValue(const std::string& key) const {
     return value->is<NullValue>() ? nullopt : std::move(value);
 }
 
-std::unordered_map<std::string, Value> VectorTileFeature::getProperties() const {
-    return feature.getProperties();
+const PropertyMap& VectorTileFeature::getProperties() const {
+    if (!properties) {
+        properties = feature.getProperties();
+    }
+    return *properties;
 }
 
 FeatureIdentifier VectorTileFeature::getID() const {