diff --git a/lib/modules/Cache.pmod/Policy.pmod/Base.pike b/lib/modules/Cache.pmod/Policy.pmod/Base.pike
index 06cabe35d5e037a7ca15cc20f0fff0523bd64c2a..295af6d551b6c2e5158ccfe8c73974107af65032 100644
--- a/lib/modules/Cache.pmod/Policy.pmod/Base.pike
+++ b/lib/modules/Cache.pmod/Policy.pmod/Base.pike
@@ -4,12 +4,12 @@
  *
  * All Storage-related class must MUST implement this method.
  *
- * $Id: Base.pike,v 1.4 2002/01/15 22:31:24 nilsson Exp $
+ * $Id: Base.pike,v 1.5 2003/01/16 14:35:58 grubba Exp $
  */
 
 #pike __REAL_VERSION__
 
-void expire(Cache.Storage storage) {
+void expire(Cache.Storage.Base storage) {
   throw("Override this!");
 }
 
diff --git a/lib/modules/Cache.pmod/Policy.pmod/Multiple.pike b/lib/modules/Cache.pmod/Policy.pmod/Multiple.pike
index 4f5c088b062b07bd639c6254359cabaec07e1a89..3f4818daa824fdd1600f92f29518858a738b2bc2 100644
--- a/lib/modules/Cache.pmod/Policy.pmod/Multiple.pike
+++ b/lib/modules/Cache.pmod/Policy.pmod/Multiple.pike
@@ -2,7 +2,7 @@
  * A multiple-policies expiration policy manager.
  * by Francesco Chemolli <kinkie@roxen.com>
  *
- * $Id: Multiple.pike,v 1.4 2002/01/15 22:31:24 nilsson Exp $
+ * $Id: Multiple.pike,v 1.5 2003/01/16 14:35:58 grubba Exp $
  */
 
 #pike __REAL_VERSION__
@@ -10,7 +10,7 @@
 inherit Cache.Policy.Base;
 private array(Cache.Policy.Base) my_policies;
 
-void expire (Cache.Storage storage) {
+void expire (Cache.Storage.Base storage) {
   foreach(my_policies, object policy) {
     policy->expire(storage);
   }
diff --git a/lib/modules/Cache.pmod/Policy.pmod/Null.pike b/lib/modules/Cache.pmod/Policy.pmod/Null.pike
index 531289a23cc323d3d5fc1326f40cf91b1b51bfb4..f3822207f5fcbe892d414dd7a573fc4691e053a7 100644
--- a/lib/modules/Cache.pmod/Policy.pmod/Null.pike
+++ b/lib/modules/Cache.pmod/Policy.pmod/Null.pike
@@ -2,7 +2,7 @@
  * Null policy-manager for the generic Caching system
  * by Francesco Chemolli <kinkie@roxen.com>
  *
- * $Id: Null.pike,v 1.4 2002/01/15 22:31:24 nilsson Exp $
+ * $Id: Null.pike,v 1.5 2003/01/16 14:35:58 grubba Exp $
  *
  * This is a policy manager that doesn't actually expire anything.
  * It is useful in multilevel and/or network-based caches.
@@ -10,6 +10,6 @@
 
 #pike __REAL_VERSION__
 
-void expire (Cache.Storage storage) {
+void expire (Cache.Storage.Base storage) {
   /* empty */
 }
diff --git a/lib/modules/Cache.pmod/Policy.pmod/Sized.pike b/lib/modules/Cache.pmod/Policy.pmod/Sized.pike
index c3272e2e89973c9b7d345e888a499788a0f5f0ba..c1f656d02ddbdc8b1d71807215081e8f0e5fb2d2 100644
--- a/lib/modules/Cache.pmod/Policy.pmod/Sized.pike
+++ b/lib/modules/Cache.pmod/Policy.pmod/Sized.pike
@@ -2,7 +2,7 @@
  * An LRU, size-constrained expiration policy manager.
  * by Francesco Chemolli <kinkie@roxen.com>
  *
- * $Id: Sized.pike,v 1.4 2002/01/15 22:31:24 nilsson Exp $
+ * $Id: Sized.pike,v 1.5 2003/01/16 14:35:58 grubba Exp $
  */
 
 #pike __REAL_VERSION__
@@ -16,7 +16,7 @@ int min_size=0;
 #define KEY 0
 #define SIZE 1
 
-void expire (Cache.Storage storage) {
+void expire (Cache.Storage.Base storage) {
   ADT.Priority_queue removables=ADT.Priority_queue();
   Cache.Data got;
   mixed tmp;
diff --git a/lib/modules/Cache.pmod/Policy.pmod/Timed.pike b/lib/modules/Cache.pmod/Policy.pmod/Timed.pike
index 6687876bae99ef20ed4561d1d69f796f1ddefc49..0aa5dd600147a478c4d85070c6025e10f08eac5a 100644
--- a/lib/modules/Cache.pmod/Policy.pmod/Timed.pike
+++ b/lib/modules/Cache.pmod/Policy.pmod/Timed.pike
@@ -2,7 +2,7 @@
  * An access-time-based expiration policy manager.
  * by Francesco Chemolli <kinkie@roxen.com>
  *
- * $Id: Timed.pike,v 1.5 2002/01/15 22:31:24 nilsson Exp $
+ * $Id: Timed.pike,v 1.6 2003/01/16 14:35:58 grubba Exp $
  */
 
 #pike __REAL_VERSION__
@@ -15,7 +15,7 @@ private int ktime;
 
 inherit Cache.Policy.Base;
 
-void expire(Cache.Storage storage) {
+void expire(Cache.Storage.Base storage) {
   werror("Expiring cache\n");
   int now=time(1);
   int limit=now-ktime;
diff --git a/lib/modules/Cache.pmod/Storage.pmod/Base.pike b/lib/modules/Cache.pmod/Storage.pmod/Base.pike
index 863405cf59bd173ad3a233f482fa72a10b2e8243..ffe1d003b82b180bcc79c7e610583bb4b7ca07ea 100644
--- a/lib/modules/Cache.pmod/Storage.pmod/Base.pike
+++ b/lib/modules/Cache.pmod/Storage.pmod/Base.pike
@@ -2,7 +2,7 @@
  * Storage Manager prototype.
  * by Francesco Chemolli <kinkie@roxen.com>
  *
- * $Id: Base.pike,v 1.7 2002/03/09 18:08:04 nilsson Exp $
+ * $Id: Base.pike,v 1.8 2003/01/16 14:35:58 grubba Exp $
  *
  * All storage managers must provide these methods.
  */
@@ -37,7 +37,7 @@ void set(string key, mixed value,
 // fetches some data from the cache synchronously.
 // be careful, as with some storage managers it might block the calling
 // thread for some time.
-int(0..0)|Cache.Data get(string key) {
+int(0..0)|Cache.Data get(string key, void|int(0..1) notouch) {
   T();
 }