diff --git a/OpenSim/Framework/ExpiringCacheOS.cs b/OpenSim/Framework/ExpiringCacheOS.cs
index 1e34dcb9f8..a8952a35f2 100644
--- a/OpenSim/Framework/ExpiringCacheOS.cs
+++ b/OpenSim/Framework/ExpiringCacheOS.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Framework
 {
     public sealed class ExpiringCacheOS<TKey1, TValue1> : IDisposable
     {
-        private const int MINEXPIRE = 500;
+        private const int MINEXPIRECHECK = 500;
 
         private Timer m_purgeTimer;
         private ReaderWriterLockSlim m_rwLock;
@@ -49,17 +49,17 @@ namespace OpenSim.Framework
             m_expireControl = new Dictionary<TKey1, int>();
             m_values = new Dictionary<TKey1, TValue1>();
             m_rwLock = new ReaderWriterLockSlim();
-            m_expire = MINEXPIRE;
+            m_expire = MINEXPIRECHECK;
             m_startTS = Util.GetTimeStampMS();
         }
 
-        public ExpiringCacheOS(int expireTimeinMS)
+        public ExpiringCacheOS(int expireCheckTimeinMS)
         {
             m_expireControl = new Dictionary<TKey1, int>();
             m_values = new Dictionary<TKey1, TValue1>();
             m_rwLock = new ReaderWriterLockSlim();
             m_startTS = Util.GetTimeStampMS();
-            m_expire = (expireTimeinMS > MINEXPIRE) ? m_expire = expireTimeinMS : MINEXPIRE;
+            m_expire = (expireCheckTimeinMS > MINEXPIRECHECK) ? m_expire = expireCheckTimeinMS : MINEXPIRECHECK;
         }
 
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
@@ -177,9 +177,9 @@ namespace OpenSim.Framework
         }
 
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
-        public void AddOrUpdate(TKey1 key, TValue1 val, int expireMS)
+        public void AddOrUpdate(TKey1 key, TValue1 val, int expireSeconds)
         {
-            Add(key, val, expireMS);
+            Add(key, val, expireSeconds * 1000);
         }
 
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
@@ -269,6 +269,12 @@ namespace OpenSim.Framework
             get { return m_expireControl.Count; }
         }
 
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
+        public bool Contains(TKey1 key)
+        {
+            return ContainsKey(key);
+        }
+
         public bool ContainsKey(TKey1 key)
         {
             bool gotLock = false;
diff --git a/OpenSim/Framework/ExpiringKey.cs b/OpenSim/Framework/ExpiringKey.cs
index ac02a67804..0168326cbe 100644
--- a/OpenSim/Framework/ExpiringKey.cs
+++ b/OpenSim/Framework/ExpiringKey.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Framework
 {
     public sealed class ExpiringKey<Tkey1> : IDisposable
     {
-        private const int MINEXPIRE = 500;
+        private const int MINEXPIRECHECK = 500;
 
         private Timer m_purgeTimer;
         private ReaderWriterLockSlim m_rwLock;
@@ -45,16 +45,16 @@ namespace OpenSim.Framework
         {
             m_dictionary = new Dictionary<Tkey1, int>();
             m_rwLock = new ReaderWriterLockSlim();
-            m_expire = MINEXPIRE;
+            m_expire = MINEXPIRECHECK;
             m_startTS = Util.GetTimeStampMS();
         }
 
-        public ExpiringKey(int expireTimeinMS)
+        public ExpiringKey(int expireCheckTimeinMS)
         {
             m_dictionary = new Dictionary<Tkey1, int>();
             m_rwLock = new ReaderWriterLockSlim();
             m_startTS = Util.GetTimeStampMS();
-            m_expire = (expireTimeinMS > MINEXPIRE) ? m_expire = expireTimeinMS : MINEXPIRE;
+            m_expire = (expireCheckTimeinMS > MINEXPIRECHECK) ? m_expire = expireCheckTimeinMS : MINEXPIRECHECK;
         }
 
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]