diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java
index dd9300bc4..787bdb7dd 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java
@@ -72,10 +72,8 @@ public Mono<T> one(T object) {
 			return Mono.just(object).flatMap(o -> {
 				CouchbaseDocument converted = template.support().encodeEntity(o);
 				return template.getCollection(collection).reactive()
-						.replace(converted.getId(), converted.export(), buildReplaceOptions(o)).map(result -> {
-							template.support().applyUpdatedCas(o, result.cas());
-							return o;
-						});
+						.replace(converted.getId(), converted.export(), buildReplaceOptions(o)).map(result ->
+								(T)template.support().applyUpdatedCas(o, result.cas()));
 			}).onErrorMap(throwable -> {
 				if (throwable instanceof RuntimeException) {
 					return template.potentiallyConvertRuntimeException((RuntimeException) throwable);
diff --git a/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeyValueIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeyValueIntegrationTests.java
index e6ad975c0..a4c0d3c55 100644
--- a/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeyValueIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeyValueIntegrationTests.java
@@ -40,6 +40,7 @@
 import org.springframework.data.couchbase.CouchbaseClientFactory;
 import org.springframework.data.couchbase.SimpleCouchbaseClientFactory;
 import org.springframework.data.couchbase.domain.Config;
+import org.springframework.data.couchbase.domain.PersonValue;
 import org.springframework.data.couchbase.domain.User;
 import org.springframework.data.couchbase.domain.UserAnnotated;
 import org.springframework.data.couchbase.util.ClusterAwareIntegrationTests;
@@ -146,44 +147,6 @@ void upsertWithExpiryAnnotation() {
 		}
 	}
 
-	@Test
-	void replaceWithExpiry() {
-		User user = new User(UUID.randomUUID().toString(), "firstname", "lastname");
-		try {
-			User modified = couchbaseTemplate.upsertById(User.class).withExpiry(Duration.ofSeconds(1)).one(user);
-			couchbaseTemplate.replaceById(User.class).withExpiry(Duration.ofSeconds(1)).one(user);
-			assertEquals(user, modified);
-			sleepSecs(2);
-			User found = couchbaseTemplate.findById(User.class).one(user.getId());
-			assertNull(found, "found should have been null as document should be expired");
-		} finally {
-			try {
-				couchbaseTemplate.removeById().one(user.getId());
-			} catch (DataRetrievalFailureException e) {
-				//
-			}
-		}
-	}
-
-	@Test
-	void replaceWithExpiryAnnotation() {
-		UserAnnotated user = new UserAnnotated(UUID.randomUUID().toString(), "firstname", "lastname");
-		try {
-			UserAnnotated modified = couchbaseTemplate.upsertById(UserAnnotated.class).one(user);
-			modified = couchbaseTemplate.replaceById(UserAnnotated.class).one(user);
-			assertEquals(user, modified);
-			sleepSecs(6);
-			User found = couchbaseTemplate.findById(UserAnnotated.class).one(user.getId());
-			assertNull(found, "found should have been null as document should be expired");
-		} finally {
-			try {
-				couchbaseTemplate.removeById().one(user.getId());
-			} catch (DataRetrievalFailureException e) {
-				//
-			}
-		}
-	}
-
 	@Test
 	void findDocWhichDoesNotExist() {
 		assertNull(couchbaseTemplate.findById(User.class).one(UUID.randomUUID().toString()));
@@ -293,6 +256,50 @@ void existsById() {
 
 	}
 
+	@Test
+	@IgnoreWhen(clusterTypes = ClusterType.MOCKED)
+	void saveAndFindImmutableById() {
+		PersonValue personValue = new PersonValue(null, 123, "f", "l");
+		System.out.println("personValue: " + personValue);
+		// personValue = personValue.withVersion(123);
+		PersonValue inserted = null;
+		PersonValue upserted = null;
+		PersonValue replaced = null;
+
+		try {
+
+			inserted = couchbaseTemplate.insertById(PersonValue.class).one(personValue);
+			assertNotEquals(0, inserted.getVersion());
+			PersonValue foundInserted = couchbaseTemplate.findById(PersonValue.class).one(inserted.getId());
+			assertNotNull(foundInserted, "inserted personValue not found");
+			assertEquals(inserted, foundInserted);
+
+			// upsert will be inserted
+			couchbaseTemplate.removeById().one(inserted.getId());
+			upserted = couchbaseTemplate.upsertById(PersonValue.class).one(inserted);
+			assertNotEquals(0, upserted.getVersion());
+			PersonValue foundUpserted = couchbaseTemplate.findById(PersonValue.class).one(upserted.getId());
+			assertNotNull(foundUpserted, "upserted personValue not found");
+			assertEquals(upserted, foundUpserted);
+
+			// upsert will be replaced
+			upserted = couchbaseTemplate.upsertById(PersonValue.class).one(inserted);
+			assertNotEquals(0, upserted.getVersion());
+			PersonValue foundUpserted2 = couchbaseTemplate.findById(PersonValue.class).one(upserted.getId());
+			assertNotNull(foundUpserted2, "upserted personValue not found");
+			assertEquals(upserted, foundUpserted2);
+
+			replaced = couchbaseTemplate.replaceById(PersonValue.class).one(upserted);
+			assertNotEquals(0, replaced.getVersion());
+			PersonValue foundReplaced = couchbaseTemplate.findById(PersonValue.class).one(replaced.getId());
+			assertNotNull(foundReplaced, "replaced personValue not found");
+			assertEquals(replaced, foundReplaced);
+
+		} finally {
+			couchbaseTemplate.removeById().one(inserted.getId());
+		}
+	}
+
 	private void sleepSecs(int i) {
 		try {
 			Thread.sleep(i * 1000);
diff --git a/src/test/java/org/springframework/data/couchbase/domain/PersonValue.java b/src/test/java/org/springframework/data/couchbase/domain/PersonValue.java
index b98046c01..32c968112 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/PersonValue.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/PersonValue.java
@@ -35,7 +35,8 @@
 public class PersonValue {
 	@Id @GeneratedValue(strategy = GenerationStrategy.UNIQUE)
 	@With String id;
-//	@Version @With
+  @Version
+	@With
 	long version;
 	@Field String firstname;
 	@Field String lastname;
diff --git a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java
index 5b18b05f0..41612eedd 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java
@@ -99,13 +99,9 @@ void saveAndFindById() {
 	@IgnoreWhen(clusterTypes = ClusterType.MOCKED)
 	void saveAndFindImmutableById() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
 		PersonValue personValue = new PersonValue(null, 0, "f", "l");
-		//assertFalse(personValueRepository.existsById(personValue.getId()));
 		personValue = personValueRepository.save(personValue);
 		Optional<PersonValue> found = personValueRepository.findById(personValue.getId());
 		assertTrue(found.isPresent());
-		Method m = PersonValue.class.getMethod("equals", Object.class);
-		m.invoke(personValue, new Object[] { found.get() });
-		personValue.equals(found.get());
 		assertEquals(personValue, found.get());
 		personValueRepository.delete(personValue);
 	}