diff --git a/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/Profile.java b/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/Profile.java
new file mode 100644
index 0000000000..165c5a9f8f
--- /dev/null
+++ b/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/Profile.java
@@ -0,0 +1,20 @@
+package com.baeldung.guava.mapmaker;
+
+public class Profile {
+    private long id;
+    private String type;
+
+    public Profile(long id, String type) {
+        this.id = id;
+        this.type = type;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return type;
+    }
+
+}
diff --git a/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/Session.java b/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/Session.java
new file mode 100644
index 0000000000..a614f431f8
--- /dev/null
+++ b/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/Session.java
@@ -0,0 +1,13 @@
+package com.baeldung.guava.mapmaker;
+
+public class Session {
+    private long id;
+
+    public Session(long id) {
+        this.id = id;
+    }
+
+    public long getId() {
+        return id;
+    }
+}
diff --git a/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/User.java b/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/User.java
new file mode 100644
index 0000000000..a7f0435049
--- /dev/null
+++ b/guava-collections-map/src/main/java/com/baeldung/guava/mapmaker/User.java
@@ -0,0 +1,20 @@
+package com.baeldung.guava.mapmaker;
+
+public class User {
+    private long id;
+    private String name;
+
+    public User(long id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+}
diff --git a/guava-collections-map/src/test/java/com/baeldung/guava/mapmaker/GuavaMapMakerUnitTest.java b/guava-collections-map/src/test/java/com/baeldung/guava/mapmaker/GuavaMapMakerUnitTest.java
new file mode 100644
index 0000000000..754e3ac099
--- /dev/null
+++ b/guava-collections-map/src/test/java/com/baeldung/guava/mapmaker/GuavaMapMakerUnitTest.java
@@ -0,0 +1,53 @@
+package com.baeldung.guava.mapmaker;
+
+import com.google.common.collect.MapMaker;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.concurrent.ConcurrentMap;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertNotNull;
+
+public class GuavaMapMakerUnitTest {
+    @Test
+    public void whenCreateCaches_thenCreated() {
+        ConcurrentMap<User, Session> sessionCache = new MapMaker().makeMap();
+        assertNotNull(sessionCache);
+
+        ConcurrentMap<User, Profile> profileCache = new MapMaker().makeMap();
+        assertNotNull(profileCache);
+
+        User userA = new User(1, "UserA");
+
+        sessionCache.put(userA, new Session(100));
+        Assert.assertThat(sessionCache.size(), equalTo(1));
+
+        profileCache.put(userA, new Profile(1000, "Personal"));
+        Assert.assertThat(profileCache.size(), equalTo(1));
+    }
+
+    @Test
+    public void whenCreateCacheWithInitialCapacity_thenCreated() {
+        ConcurrentMap<User, Profile> profileCache = new MapMaker().initialCapacity(100).makeMap();
+        assertNotNull(profileCache);
+    }
+
+    @Test
+    public void whenCreateCacheWithConcurrencyLevel_thenCreated() {
+        ConcurrentMap<User, Session> sessionCache = new MapMaker().concurrencyLevel(10).makeMap();
+        assertNotNull(sessionCache);
+    }
+
+    @Test
+    public void whenCreateCacheWithWeakKeys_thenCreated() {
+        ConcurrentMap<User, Session> sessionCache = new MapMaker().weakKeys().makeMap();
+        assertNotNull(sessionCache);
+    }
+
+    @Test
+    public void whenCreateCacheWithWeakValues_thenCreated() {
+        ConcurrentMap<User, Profile> profileCache = new MapMaker().weakValues().makeMap();
+        assertNotNull(profileCache);
+    }
+}