diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlUnparsedQuery.java b/src/test/java/com/avaje/tests/rawsql/TestRawSqlUnparsedQuery.java
new file mode 100644
index 000000000..c2843b320
--- /dev/null
+++ b/src/test/java/com/avaje/tests/rawsql/TestRawSqlUnparsedQuery.java
@@ -0,0 +1,37 @@
+package com.avaje.tests.rawsql;
+
+import com.avaje.ebean.*;
+import com.avaje.tests.model.basic.Customer;
+import com.avaje.tests.model.basic.ResetBasicData;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.List;
+
+public class TestRawSqlUnparsedQuery extends BaseTestCase {
+
+    @Test
+    public void testDoubleUnparsedQuery() {
+
+        // Checks for RawSql caching issue https://github.com/ebean-orm/avaje-ebeanorm/issues/259
+        ResetBasicData.reset();
+
+        test();
+        test();
+    }
+
+    private static void test() {
+        RawSql rawSql = RawSqlBuilder
+                .unparsed("select r.id, r.name from o_customer r where r.id >= :a and r.name like :b")
+                .columnMapping("r.id", "id").columnMapping("r.name", "name").create();
+
+        Query<Customer> query = Ebean.find(Customer.class);
+        query.setRawSql(rawSql);
+        query.setParameter("a", 1);
+        query.setParameter("b", "R%");
+
+        List<Customer> list = query.findList();
+        Assert.assertNotNull(list);
+    }
+
+}