diff --git a/NuGet/ServiceStack.Authentication.MongoDB/servicestack.authentication.mongodb.nuspec b/NuGet/ServiceStack.Authentication.MongoDB/servicestack.authentication.mongodb.nuspec
index eb66c99..c3464d1 100644
--- a/NuGet/ServiceStack.Authentication.MongoDB/servicestack.authentication.mongodb.nuspec
+++ b/NuGet/ServiceStack.Authentication.MongoDB/servicestack.authentication.mongodb.nuspec
@@ -12,7 +12,7 @@
         inc. Twitter, Facebook, Basic, Digest, Credentials Auth modes out-of-the-box.
     </description> 
     <projectUrl>https://github.com/ServiceStack/ServiceStack.OrmLite</projectUrl>
-    <licenseUrl>https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE</licenseUrl>
+    <licenseUrl>https://github.com/ServiceStack/ServiceStack/blob/v3/LICENSE</licenseUrl>
     <iconUrl>http://www.servicestack.net/logo-100x100.png</iconUrl>
     <tags>ServiceStack Authentication Authorization MongoDB NoSQL POCO Code-First</tags>
     <language>en-US</language> 
diff --git a/NuGet/ServiceStack.Authentication.NHibernate/servicestack.authentication.nhibernate.nuspec b/NuGet/ServiceStack.Authentication.NHibernate/servicestack.authentication.nhibernate.nuspec
index 94f5326..bddaf8d 100644
--- a/NuGet/ServiceStack.Authentication.NHibernate/servicestack.authentication.nhibernate.nuspec
+++ b/NuGet/ServiceStack.Authentication.NHibernate/servicestack.authentication.nhibernate.nuspec
@@ -12,7 +12,7 @@
         inc. Twitter, Facebook, Basic, Digest, Credentials Auth modes out-of-the-box.
     </description> 
     <projectUrl>https://github.com/ServiceStack/ServiceStack.OrmLite</projectUrl>
-    <licenseUrl>https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE</licenseUrl>
+    <licenseUrl>https://github.com/ServiceStack/ServiceStack/blob/v3/LICENSE</licenseUrl>
     <iconUrl>http://www.servicestack.net/logo-100x100.png</iconUrl>
     <tags>ServiceStack Authentication Authorization NHibernate SQLServer Sqlite Oracle MySql PostgreSQL POCO Code-First</tags>
     <language>en-US</language> 
diff --git a/NuGet/ServiceStack.Authentication.RavenDb/servicestack.authentication.ravendb.nuspec b/NuGet/ServiceStack.Authentication.RavenDb/servicestack.authentication.ravendb.nuspec
index bc50eeb..1b263e8 100644
--- a/NuGet/ServiceStack.Authentication.RavenDb/servicestack.authentication.ravendb.nuspec
+++ b/NuGet/ServiceStack.Authentication.RavenDb/servicestack.authentication.ravendb.nuspec
@@ -12,7 +12,7 @@
       inc. Twitter, Facebook, Basic, Digest, Credentials Auth modes out-of-the-box.
     </description> 
     <projectUrl>https://github.com/ServiceStack/ServiceStack.OrmLite</projectUrl>
-    <licenseUrl>https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE</licenseUrl>
+    <licenseUrl>https://github.com/ServiceStack/ServiceStack/blob/v3/LICENSE</licenseUrl>
     <iconUrl>http://www.servicestack.net/logo-100x100.png</iconUrl>
     <tags>ServiceStack Authentication Authorization RavenDB Raven NoSQL POCO Code-First</tags>
     <language>en-US</language> 
diff --git a/NuGet/ServiceStack.Caching.AwsDynamoDb/servicestack.caching.awsdynamodb.nuspec b/NuGet/ServiceStack.Caching.AwsDynamoDb/servicestack.caching.awsdynamodb.nuspec
index 65ada77..ce9caa8 100644
--- a/NuGet/ServiceStack.Caching.AwsDynamoDb/servicestack.caching.awsdynamodb.nuspec
+++ b/NuGet/ServiceStack.Caching.AwsDynamoDb/servicestack.caching.awsdynamodb.nuspec
@@ -10,7 +10,7 @@
         https://github.com/ServiceStack/ServiceStack/wiki/Caching
     </description> 
     <projectUrl>https://github.com/ServiceStack/ServiceStack.OrmLite</projectUrl>
-    <licenseUrl>https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE</licenseUrl>
+    <licenseUrl>https://github.com/ServiceStack/ServiceStack/blob/v3/LICENSE</licenseUrl>
     <iconUrl>http://www.servicestack.net/logo-100x100.png</iconUrl>
     <tags>ServiceStack Caching AwsDynamoDb Amazon WebServices AWS DynamoDb Cache CacheClient</tags>
     <language>en-US</language> 
diff --git a/NuGet/ServiceStack.Caching.Azure/servicestack.caching.azure.nuspec b/NuGet/ServiceStack.Caching.Azure/servicestack.caching.azure.nuspec
index 3f81294..6bda488 100644
--- a/NuGet/ServiceStack.Caching.Azure/servicestack.caching.azure.nuspec
+++ b/NuGet/ServiceStack.Caching.Azure/servicestack.caching.azure.nuspec
@@ -10,7 +10,7 @@
         https://github.com/ServiceStack/ServiceStack/wiki/Caching
     </description> 
     <projectUrl>https://github.com/ServiceStack/ServiceStack.OrmLite</projectUrl>
-    <licenseUrl>https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE</licenseUrl>
+    <licenseUrl>https://github.com/ServiceStack/ServiceStack/blob/v3/LICENSE</licenseUrl>
     <iconUrl>http://www.servicestack.net/logo-100x100.png</iconUrl>
     <tags>ServiceStack Caching Windows Azure Cache CacheClient POCO Code-First</tags>
     <language>en-US</language> 
diff --git a/NuGet/ServiceStack.Caching.Memcached/servicestack.caching.memcached.nuspec b/NuGet/ServiceStack.Caching.Memcached/servicestack.caching.memcached.nuspec
index 3242cae..5717df7 100644
--- a/NuGet/ServiceStack.Caching.Memcached/servicestack.caching.memcached.nuspec
+++ b/NuGet/ServiceStack.Caching.Memcached/servicestack.caching.memcached.nuspec
@@ -10,7 +10,7 @@
         https://github.com/ServiceStack/ServiceStack/wiki/Caching
     </description> 
     <projectUrl>https://github.com/ServiceStack/ServiceStack.OrmLite</projectUrl>
-    <licenseUrl>https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE</licenseUrl>
+    <licenseUrl>https://github.com/ServiceStack/ServiceStack/blob/v3/LICENSE</licenseUrl>
     <iconUrl>http://www.servicestack.net/logo-100x100.png</iconUrl>
     <tags>ServiceStack Caching Memcached Cache CacheClient POCO Code-First</tags>
     <language>en-US</language> 
diff --git a/lib/ServiceStack.Common.dll b/lib/ServiceStack.Common.dll
index adb20be..404daa2 100644
Binary files a/lib/ServiceStack.Common.dll and b/lib/ServiceStack.Common.dll differ
diff --git a/lib/ServiceStack.Interfaces.dll b/lib/ServiceStack.Interfaces.dll
index 349f299..00f17f5 100644
Binary files a/lib/ServiceStack.Interfaces.dll and b/lib/ServiceStack.Interfaces.dll differ
diff --git a/lib/ServiceStack.Redis.dll b/lib/ServiceStack.Redis.dll
index a9cac20..c85aeaf 100644
Binary files a/lib/ServiceStack.Redis.dll and b/lib/ServiceStack.Redis.dll differ
diff --git a/lib/ServiceStack.ServiceInterface.dll b/lib/ServiceStack.ServiceInterface.dll
index 6268907..c5d02ca 100644
Binary files a/lib/ServiceStack.ServiceInterface.dll and b/lib/ServiceStack.ServiceInterface.dll differ
diff --git a/lib/ServiceStack.Text.dll b/lib/ServiceStack.Text.dll
index 85cf7f8..8249cb9 100644
Binary files a/lib/ServiceStack.Text.dll and b/lib/ServiceStack.Text.dll differ
diff --git a/lib/ServiceStack.dll b/lib/ServiceStack.dll
index ee86f56..cd7a3ce 100644
Binary files a/lib/ServiceStack.dll and b/lib/ServiceStack.dll differ
diff --git a/src/ServiceStack.Authentication.MongoDB/MongoDBAuthRepository.cs b/src/ServiceStack.Authentication.MongoDB/MongoDBAuthRepository.cs
index 4b08fd5..8cd2121 100644
--- a/src/ServiceStack.Authentication.MongoDB/MongoDBAuthRepository.cs
+++ b/src/ServiceStack.Authentication.MongoDB/MongoDBAuthRepository.cs
@@ -136,7 +136,7 @@ public UserAuth CreateUserAuth(UserAuth newUser, string password)
 			string hash;
 			saltedHash.GetHashAndSaltString(password, out hash, out salt);
 			var digestHelper = new DigestAuthFunctions();
-			newUser.DigestHA1Hash = digestHelper.CreateHa1(newUser.UserName, DigestAuthProvider.Realm, password);
+			newUser.DigestHa1Hash = digestHelper.CreateHa1(newUser.UserName, DigestAuthProvider.Realm, password);
 			newUser.PasswordHash = hash;
 			newUser.Salt = salt;
 			newUser.CreatedDate = DateTime.UtcNow;
@@ -206,7 +206,7 @@ public UserAuth UpdateUserAuth(UserAuth existingUser, UserAuth newUser, string p
 				saltedHash.GetHashAndSaltString(password, out hash, out salt);
 			}
 			// If either one changes the digest hash has to be recalculated
-			var digestHash = existingUser.DigestHA1Hash;
+			var digestHash = existingUser.DigestHa1Hash;
 			if (password != null || existingUser.UserName != newUser.UserName)
 			{
 				var digestHelper = new DigestAuthFunctions();
@@ -215,7 +215,7 @@ public UserAuth UpdateUserAuth(UserAuth existingUser, UserAuth newUser, string p
 			newUser.Id = existingUser.Id;
 			newUser.PasswordHash = hash;
 			newUser.Salt = salt;
-			newUser.DigestHA1Hash = digestHash;
+			newUser.DigestHa1Hash = digestHash;
 			newUser.CreatedDate = existingUser.CreatedDate;
 			newUser.ModifiedDate = DateTime.UtcNow;
 			SaveUser(newUser);
@@ -264,7 +264,7 @@ public bool TryAuthenticate(Dictionary<string, string> digestHeaders, string Pri
 			if (userAuth == null) return false;
 
 			var digestHelper = new DigestAuthFunctions();
-			if (digestHelper.ValidateResponse(digestHeaders, PrivateKey, NonceTimeOut, userAuth.DigestHA1Hash, sequence))
+			if (digestHelper.ValidateResponse(digestHeaders, PrivateKey, NonceTimeOut, userAuth.DigestHa1Hash, sequence))
 			{
 				//userId = userAuth.Id.ToString(CultureInfo.InvariantCulture);
 				return true;
diff --git a/src/ServiceStack.Authentication.MongoDB/ServiceStack.Authentication.MongoDB.csproj b/src/ServiceStack.Authentication.MongoDB/ServiceStack.Authentication.MongoDB.csproj
index 43c2503..c396366 100644
--- a/src/ServiceStack.Authentication.MongoDB/ServiceStack.Authentication.MongoDB.csproj
+++ b/src/ServiceStack.Authentication.MongoDB/ServiceStack.Authentication.MongoDB.csproj
@@ -13,6 +13,8 @@
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -43,6 +45,9 @@
     <Reference Include="ServiceStack.Common">
       <HintPath>..\..\lib\ServiceStack.Common.dll</HintPath>
     </Reference>
+    <Reference Include="ServiceStack.Interfaces">
+      <HintPath>..\..\lib\ServiceStack.Interfaces.dll</HintPath>
+    </Reference>
     <Reference Include="ServiceStack.ServiceInterface">
       <HintPath>..\..\lib\ServiceStack.ServiceInterface.dll</HintPath>
     </Reference>
@@ -61,6 +66,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/ServiceStack.Authentication.NHibernate/NHibernateUserAuthRepository.cs b/src/ServiceStack.Authentication.NHibernate/NHibernateUserAuthRepository.cs
index a51dc09..7a45b1e 100644
--- a/src/ServiceStack.Authentication.NHibernate/NHibernateUserAuthRepository.cs
+++ b/src/ServiceStack.Authentication.NHibernate/NHibernateUserAuthRepository.cs
@@ -115,7 +115,7 @@ public bool TryAuthenticate(Dictionary<string, string> digestHeaders, string pri
             if (userAuth == null) return false;
 
             var digestHelper = new DigestAuthFunctions();
-            return digestHelper.ValidateResponse(digestHeaders, privateKey, nonceTimeOut, userAuth.DigestHA1Hash, sequence);
+            return digestHelper.ValidateResponse(digestHeaders, privateKey, nonceTimeOut, userAuth.DigestHa1Hash, sequence);
         }
 
         public UserAuth GetUserAuthByUserName(string userNameOrEmail)
diff --git a/src/ServiceStack.Authentication.NHibernate/ServiceStack.Authentication.NHibernate.csproj b/src/ServiceStack.Authentication.NHibernate/ServiceStack.Authentication.NHibernate.csproj
index 04250cd..2036899 100644
--- a/src/ServiceStack.Authentication.NHibernate/ServiceStack.Authentication.NHibernate.csproj
+++ b/src/ServiceStack.Authentication.NHibernate/ServiceStack.Authentication.NHibernate.csproj
@@ -12,6 +12,8 @@
     <AssemblyName>ServiceStack.Authentication.NHibernate</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -71,6 +73,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/ServiceStack.Authentication.RavenDb/RavenUserAuthRepository.cs b/src/ServiceStack.Authentication.RavenDb/RavenUserAuthRepository.cs
index 20e7b5d..f9f1a74 100644
--- a/src/ServiceStack.Authentication.RavenDb/RavenUserAuthRepository.cs
+++ b/src/ServiceStack.Authentication.RavenDb/RavenUserAuthRepository.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.Composition.Hosting;
 using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
 using Raven.Client;
+using Raven.Client.Indexes;
 using ServiceStack.Common;
 using ServiceStack.ServiceInterface.Auth;
 using ServiceStack.Text;
@@ -16,25 +18,25 @@ public class RavenUserAuthRepository : IUserAuthRepository
 		public Regex ValidUserNameRegEx = new Regex(@"^(?=.{3,15}$)([A-Za-z0-9][._-]?)*$", RegexOptions.Compiled);
 
 		private readonly IDocumentStore _documentStore;
+        //Session object is created somewhere else and injected here
+        private readonly IDocumentSession _session;
 	    private static bool _isInitialized = false;
 
-        public static void CreateOrUpdateUserAuthIndex(IDocumentStore store)
+        //Change to allow for Multi- Tenancy cases
+        //User has to call this method every time he creates a new tenant DB
+        public static void CreateOrUpdateUserAuthIndex(IDocumentStore store,string databaseName)
         {
             // put this index into the ravendb database
-            new ServiceStack_UserAuth_ByUserNameOrEmail().Execute(store);
-            new ServiceStack_UserAuth_ByOAuthProvider().Execute(store);
+            var catalog = new CompositionContainer(new AssemblyCatalog(typeof(ServiceStack_UserAuth_ByUserNameOrEmail).Assembly));
+            IndexCreation.CreateIndexes(catalog, store.DatabaseCommands.ForDatabase(databaseName), store.Conventions);
             _isInitialized = true;
         }
 
-		public RavenUserAuthRepository(IDocumentStore documentStore)
+		public RavenUserAuthRepository(IDocumentStore documentStore,IDocumentSession session)
 		{
 			_documentStore = documentStore;
-         
-            // if the user didn't call this method in their AppHostBase
-            // Let's call if for them. No worries if this is called a few
-            // times, we just don't want it running all the time
-            if (!_isInitialized) 
-                CreateOrUpdateUserAuthIndex(documentStore);
+		    _session = session;
+
 		}
 
 		private void ValidateNewUser(UserAuth newUser, string password)
@@ -69,16 +71,16 @@ public UserAuth CreateUserAuth(UserAuth newUser, string password)
 			string hash;
 			saltedHash.GetHashAndSaltString(password, out hash, out salt);
 			var digestHelper = new DigestAuthFunctions();
-			newUser.DigestHA1Hash = digestHelper.CreateHa1(newUser.UserName, DigestAuthProvider.Realm, password);
+			newUser.DigestHa1Hash = digestHelper.CreateHa1(newUser.UserName, DigestAuthProvider.Realm, password);
 			newUser.PasswordHash = hash;
 			newUser.Salt = salt;
 			newUser.CreatedDate = DateTime.UtcNow;
 			newUser.ModifiedDate = newUser.CreatedDate;
 
-			using (var session = _documentStore.OpenSession())
+			using (_session)
 			{
-				session.Store(newUser);
-				session.SaveChanges();
+				_session.Store(newUser);
+				_session.SaveChanges();
 			}
 
 			return newUser;
@@ -116,7 +118,7 @@ public UserAuth UpdateUserAuth(UserAuth existingUser, UserAuth newUser, string p
 				saltedHash.GetHashAndSaltString(password, out hash, out salt);
 			}
 			// If either one changes the digest hash has to be recalculated
-			var digestHash = existingUser.DigestHA1Hash;
+			var digestHash = existingUser.DigestHa1Hash;
 			if (password != null || existingUser.UserName != newUser.UserName)
 			{
 				var digestHelper = new DigestAuthFunctions();
@@ -125,14 +127,14 @@ public UserAuth UpdateUserAuth(UserAuth existingUser, UserAuth newUser, string p
 			newUser.Id = existingUser.Id;
 			newUser.PasswordHash = hash;
 			newUser.Salt = salt;
-			newUser.DigestHA1Hash = digestHash;
+			newUser.DigestHa1Hash = digestHash;
 			newUser.CreatedDate = existingUser.CreatedDate;
 			newUser.ModifiedDate = DateTime.UtcNow;
 
-			using (var session = _documentStore.OpenSession())
+			using (_session)
 			{
-				session.Store(newUser);
-				session.SaveChanges();
+                _session.Store(newUser);
+                _session.SaveChanges();
 			}
 
 			return newUser;
@@ -140,9 +142,9 @@ public UserAuth UpdateUserAuth(UserAuth existingUser, UserAuth newUser, string p
 
 		public UserAuth GetUserAuthByUserName(string userNameOrEmail)
 		{
-            using (var session = _documentStore.OpenSession())
+            using (_session)
             {
-                var userAuth = session.Query<ServiceStack_UserAuth_ByUserNameOrEmail.Result, ServiceStack_UserAuth_ByUserNameOrEmail>()
+                var userAuth = _session.Query<ServiceStack_UserAuth_ByUserNameOrEmail.Result, ServiceStack_UserAuth_ByUserNameOrEmail>()
                        .Customize(x => x.WaitForNonStaleResultsAsOfNow())
                        .Search(x => x.Search, userNameOrEmail)
                        .OfType<UserAuth>()
@@ -175,7 +177,7 @@ public bool TryAuthenticate(Dictionary<string, string> digestHeaders, string Pri
 			if (userAuth == null) return false;
 
 			var digestHelper = new DigestAuthFunctions();
-			if (digestHelper.ValidateResponse(digestHeaders, PrivateKey, NonceTimeOut, userAuth.DigestHA1Hash, sequence))
+			if (digestHelper.ValidateResponse(digestHeaders, PrivateKey, NonceTimeOut, userAuth.DigestHa1Hash, sequence))
 			{
 				return true;
 			}
@@ -207,21 +209,24 @@ private void LoadUserAuth(IAuthSession session, UserAuth userAuth)
 
 		public UserAuth GetUserAuth(string userAuthId)
 		{
-			using (var session = _documentStore.OpenSession())
+			using(_session)
 			{
-				return session.Load<UserAuth>(userAuthId);
+				int intAuthId;
+				return int.TryParse(userAuthId, out intAuthId)
+					? _session.Load<UserAuth>(intAuthId)
+					: _session.Load<UserAuth>(userAuthId);
 			}
 		}
 
 		public void SaveUserAuth(IAuthSession authSession)
 		{
-			using (var session = _documentStore.OpenSession())
+            using (_session)
 			{
 				int idInt = int.Parse(authSession.UserAuthId);
 
 				var userAuth = !authSession.UserAuthId.IsNullOrEmpty()
-					               ? session.Load<UserAuth>(idInt)
-					               : authSession.TranslateTo<UserAuth>();
+                                   ? _session.Load<UserAuth>(idInt)
+                                   : authSession.TranslateTo<UserAuth>();
 
 				if (userAuth.Id == default(int) && !authSession.UserAuthId.IsNullOrEmpty())
 					userAuth.Id = idInt;
@@ -230,30 +235,30 @@ public void SaveUserAuth(IAuthSession authSession)
 				if (userAuth.CreatedDate == default(DateTime))
 					userAuth.CreatedDate = userAuth.ModifiedDate;
 
-				session.Store(userAuth);
-				session.SaveChanges();
+                _session.Store(userAuth);
+                _session.SaveChanges();
 			}
 		}
 
 		public void SaveUserAuth(UserAuth userAuth)
 		{
-			using (var session = _documentStore.OpenSession())
+            using (_session)
 			{
 				userAuth.ModifiedDate = DateTime.UtcNow;
 				if (userAuth.CreatedDate == default(DateTime))
 					userAuth.CreatedDate = userAuth.ModifiedDate;
 
-				session.Store(userAuth);
-				session.SaveChanges();
+                _session.Store(userAuth);
+                _session.SaveChanges();
 			}
 		}
 
 		public List<UserOAuthProvider> GetUserOAuthProviders(string userAuthId)
 		{
-			using (var session = _documentStore.OpenSession())
+            using (_session)
 			{
 				var id = int.Parse(userAuthId);
-				return session.Query<ServiceStack_UserAuth_ByOAuthProvider.Result, ServiceStack_UserAuth_ByOAuthProvider>()
+                return _session.Query<ServiceStack_UserAuth_ByOAuthProvider.Result, ServiceStack_UserAuth_ByOAuthProvider>()
                     .Customize(x => x.WaitForNonStaleResultsAsOfNow())
                     .Where(q => q.UserAuthId == id)
                     .OrderBy(x => x.ModifiedDate)
@@ -278,9 +283,9 @@ public UserAuth GetUserAuth(IAuthSession authSession, IOAuthTokens tokens)
 			if (tokens == null || tokens.Provider.IsNullOrEmpty() || tokens.UserId.IsNullOrEmpty())
 				return null;
 
-			using (var session = _documentStore.OpenSession())
+            using (_session)
 			{
-			    var oAuthProvider = session
+                var oAuthProvider = _session
 			        .Query<ServiceStack_UserAuth_ByOAuthProvider.Result, ServiceStack_UserAuth_ByOAuthProvider>()
                     .Customize(x => x.WaitForNonStaleResultsAsOfNow())
 			        .Where(q => q.Provider == tokens.Provider && q.UserId == tokens.UserId)
@@ -289,7 +294,7 @@ public UserAuth GetUserAuth(IAuthSession authSession, IOAuthTokens tokens)
 
 				if (oAuthProvider != null)
 				{
-					var userAuth = session.Load<UserAuth>(oAuthProvider.UserAuthId);
+                    var userAuth = _session.Load<UserAuth>(oAuthProvider.UserAuthId);
 					return userAuth;
 				}
 				return null;
@@ -300,9 +305,9 @@ public string CreateOrMergeAuthSession(IAuthSession authSession, IOAuthTokens to
 		{
 			var userAuth = GetUserAuth(authSession, tokens) ?? new UserAuth();
 
-			using (var session = _documentStore.OpenSession())
+            using (_session)
 			{
-                var oAuthProvider = session
+                var oAuthProvider = _session
                     .Query<ServiceStack_UserAuth_ByOAuthProvider.Result, ServiceStack_UserAuth_ByOAuthProvider>()
                     .Customize(x => x.WaitForNonStaleResultsAsOfNow())
                     .Where(q => q.Provider == tokens.Provider && q.UserId == tokens.UserId)
@@ -325,8 +330,8 @@ public string CreateOrMergeAuthSession(IAuthSession authSession, IOAuthTokens to
 				if (userAuth.CreatedDate == default(DateTime))
 					userAuth.CreatedDate = userAuth.ModifiedDate;
 
-				session.Store(userAuth);
-				session.SaveChanges();
+                _session.Store(userAuth);
+                _session.SaveChanges();
 
 				oAuthProvider.UserAuthId = userAuth.Id;
 
@@ -334,8 +339,8 @@ public string CreateOrMergeAuthSession(IAuthSession authSession, IOAuthTokens to
 					oAuthProvider.CreatedDate = userAuth.ModifiedDate;
 				oAuthProvider.ModifiedDate = userAuth.ModifiedDate;
 
-				session.Store(oAuthProvider);
-				session.SaveChanges();
+                _session.Store(oAuthProvider);
+                _session.SaveChanges();
 
 				return oAuthProvider.UserAuthId.ToString(CultureInfo.InvariantCulture);
 			}
diff --git a/src/ServiceStack.Authentication.RavenDb/ServiceStack.Authentication.RavenDb.csproj b/src/ServiceStack.Authentication.RavenDb/ServiceStack.Authentication.RavenDb.csproj
index d283b2a..52a3133 100644
--- a/src/ServiceStack.Authentication.RavenDb/ServiceStack.Authentication.RavenDb.csproj
+++ b/src/ServiceStack.Authentication.RavenDb/ServiceStack.Authentication.RavenDb.csproj
@@ -12,6 +12,8 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,6 +72,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/ServiceStack.CacheAccess.AwsDynamoDb/ServiceStack.CacheAccess.AwsDynamoDb.csproj b/src/ServiceStack.CacheAccess.AwsDynamoDb/ServiceStack.CacheAccess.AwsDynamoDb.csproj
index 03a9ea3..4899e44 100644
--- a/src/ServiceStack.CacheAccess.AwsDynamoDb/ServiceStack.CacheAccess.AwsDynamoDb.csproj
+++ b/src/ServiceStack.CacheAccess.AwsDynamoDb/ServiceStack.CacheAccess.AwsDynamoDb.csproj
@@ -12,6 +12,8 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -57,6 +59,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/ServiceStack.CacheAccess.Azure/ServiceStack.CacheAccess.Azure.csproj b/src/ServiceStack.CacheAccess.Azure/ServiceStack.CacheAccess.Azure.csproj
index f114dad..5d5419f 100644
--- a/src/ServiceStack.CacheAccess.Azure/ServiceStack.CacheAccess.Azure.csproj
+++ b/src/ServiceStack.CacheAccess.Azure/ServiceStack.CacheAccess.Azure.csproj
@@ -12,6 +12,8 @@
     <AssemblyName>ServiceStack.CacheAccess.Azure</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,6 +70,7 @@
     <None Include="README.md" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/ServiceStack.CacheAccess.Memcached/ServiceStack.CacheAccess.Memcached.csproj b/src/ServiceStack.CacheAccess.Memcached/ServiceStack.CacheAccess.Memcached.csproj
index 9480c0d..76eac2d 100644
--- a/src/ServiceStack.CacheAccess.Memcached/ServiceStack.CacheAccess.Memcached.csproj
+++ b/src/ServiceStack.CacheAccess.Memcached/ServiceStack.CacheAccess.Memcached.csproj
@@ -31,6 +31,8 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -130,6 +132,7 @@
     <None Include="README.md" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/packages/EnyimMemcached.2.11/EnyimMemcached.2.11.nupkg b/src/packages/EnyimMemcached.2.11/EnyimMemcached.2.11.nupkg
new file mode 100644
index 0000000..3918474
Binary files /dev/null and b/src/packages/EnyimMemcached.2.11/EnyimMemcached.2.11.nupkg differ
diff --git a/src/packages/EnyimMemcached.2.11/lib/net35/Enyim.Caching.dll b/src/packages/EnyimMemcached.2.11/lib/net35/Enyim.Caching.dll
new file mode 100644
index 0000000..8981271
Binary files /dev/null and b/src/packages/EnyimMemcached.2.11/lib/net35/Enyim.Caching.dll differ
diff --git a/tests/ServiceStack.CacheAccess.AwsDynamoDb.Tests/ServiceStack.CacheAccess.AwsDynamoDb.Tests.csproj b/tests/ServiceStack.CacheAccess.AwsDynamoDb.Tests/ServiceStack.CacheAccess.AwsDynamoDb.Tests.csproj
index 82c793d..c301567 100644
--- a/tests/ServiceStack.CacheAccess.AwsDynamoDb.Tests/ServiceStack.CacheAccess.AwsDynamoDb.Tests.csproj
+++ b/tests/ServiceStack.CacheAccess.AwsDynamoDb.Tests/ServiceStack.CacheAccess.AwsDynamoDb.Tests.csproj
@@ -11,6 +11,8 @@
     <AssemblyName>ServiceStack.CacheAccess.AwsDynamoDb.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\src\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -62,6 +64,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/tests/ServiceStack.CacheAccess.Memcached.Tests/ServiceStack.CacheAccess.Memcached.Tests.csproj b/tests/ServiceStack.CacheAccess.Memcached.Tests/ServiceStack.CacheAccess.Memcached.Tests.csproj
index ad8a81e..7a64a8f 100644
--- a/tests/ServiceStack.CacheAccess.Memcached.Tests/ServiceStack.CacheAccess.Memcached.Tests.csproj
+++ b/tests/ServiceStack.CacheAccess.Memcached.Tests/ServiceStack.CacheAccess.Memcached.Tests.csproj
@@ -31,6 +31,8 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\src\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -124,6 +126,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">