diff --git a/sampleApp/src/main/java/com/zeyad/usecases/app/di/myModule.kt b/sampleApp/src/main/java/com/zeyad/usecases/app/di/myModule.kt
index dfe7c0c..fee274e 100644
--- a/sampleApp/src/main/java/com/zeyad/usecases/app/di/myModule.kt
+++ b/sampleApp/src/main/java/com/zeyad/usecases/app/di/myModule.kt
@@ -39,7 +39,7 @@ fun createDataService(context: Context, db: AppDatabase): IDataService {
     return DataServiceFactory(DataServiceConfig.Builder(context)
             .baseUrl(API_BASE_URL)
             .okHttpBuilder(getOkHttpBuilder())
-            .withSQLite(object : DataBaseManagerUtil {
+            .withRoom(object : DataBaseManagerUtil {
                 override fun getDataBaseManager(dataClass: Class<*>): DataBaseManager? {
                     return RoomManager(db, object : DaoResolver {
                         override fun <E> getDao(dataClass: Class<E>): BaseDao<E> {
diff --git a/usecases/src/main/java/com/zeyad/usecases/api/DataServiceConfig.kt b/usecases/src/main/java/com/zeyad/usecases/api/DataServiceConfig.kt
index 7d74696..e52a1e3 100644
--- a/usecases/src/main/java/com/zeyad/usecases/api/DataServiceConfig.kt
+++ b/usecases/src/main/java/com/zeyad/usecases/api/DataServiceConfig.kt
@@ -75,19 +75,15 @@ data class DataServiceConfig internal constructor(val context: Context,
             return this
         }
 
-        fun withCache(expiryAmount: Long, timeUnit: TimeUnit): Builder {
+        fun withCache(expiryAmount: Long, timeUnit: TimeUnit, cacheSize: Int = 0): Builder {
             this.withCache = true
             this.cacheDuration = expiryAmount
             this.timeUnit = timeUnit
-            return this
-        }
-
-        fun cacheSize(cacheSize: Int): Builder {
             this.cacheSize = cacheSize
             return this
         }
 
-        fun withSQLite(dataBaseManagerUtil: DataBaseManagerUtil): Builder {
+        fun withRoom(dataBaseManagerUtil: DataBaseManagerUtil): Builder {
             this.dataBaseManagerUtil = dataBaseManagerUtil
             this.withSQLite = true
             return this
diff --git a/usecases/src/test/java/com/zeyad/usecases/api/DataServiceConfigTest.kt b/usecases/src/test/java/com/zeyad/usecases/api/DataServiceConfigTest.kt
index 6906d1d..23f3a0d 100644
--- a/usecases/src/test/java/com/zeyad/usecases/api/DataServiceConfigTest.kt
+++ b/usecases/src/test/java/com/zeyad/usecases/api/DataServiceConfigTest.kt
@@ -45,11 +45,10 @@ class DataServiceConfigTest {
         cache = Cache(File("", "http-cache"), (10 * 1024 * 1024).toLong())
         mDataServiceConfig = DataServiceConfig.Builder(mockContext)
                 .baseUrl(URL)
-                .cacheSize(cacheSize)
                 .okHttpBuilder(builder)
                 .okHttpCache(cache)
-                .withCache(3, TimeUnit.MINUTES)
-                .withSQLite(object : DataBaseManagerUtil {
+                .withCache(3, TimeUnit.MINUTES, cacheSize)
+                .withRoom(object : DataBaseManagerUtil {
                     override fun getDataBaseManager(dataClass: Class<*>): DataBaseManager? {
                         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
                     }
diff --git a/usecases/src/test/java/com/zeyad/usecases/api/DataServiceFactoryTest.kt b/usecases/src/test/java/com/zeyad/usecases/api/DataServiceFactoryTest.kt
index 8fb4277..8f3712b 100644
--- a/usecases/src/test/java/com/zeyad/usecases/api/DataServiceFactoryTest.kt
+++ b/usecases/src/test/java/com/zeyad/usecases/api/DataServiceFactoryTest.kt
@@ -4,10 +4,10 @@ import android.content.Context
 import android.support.test.rule.BuildConfig
 import com.zeyad.usecases.db.DataBaseManager
 import com.zeyad.usecases.utils.DataBaseManagerUtil
-import junit.framework.Assert.assertEquals
-import junit.framework.Assert.assertNotNull
 import okhttp3.Cache
 import okhttp3.OkHttpClient
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -24,7 +24,6 @@ import java.util.concurrent.TimeUnit
 @Config(constants = BuildConfig::class, sdk = [25])
 class DataServiceFactoryTest {
     private val URL = "https://api.github.com/"
-    private val cacheSize = 8192
     private lateinit var mDataServiceConfig: DataServiceConfig
     private lateinit var mockContext: Context
     private lateinit var builder: OkHttpClient.Builder
@@ -43,10 +42,9 @@ class DataServiceFactoryTest {
                 (10 * 1024 * 1024).toLong())
         mDataServiceConfig = DataServiceConfig.Builder(mockContext)
                 .baseUrl(URL)
-                .cacheSize(cacheSize)
                 .okHttpBuilder(builder)
                 .okHttpCache(cache)
-                .withSQLite(object : DataBaseManagerUtil {
+                .withRoom(object : DataBaseManagerUtil {
                     override fun getDataBaseManager(dataClass: Class<*>): DataBaseManager? {
 //                        RoomManager()
                         return null