Index: openacs-4/packages/acs-tcl/tcl/defs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/defs-procs.tcl,v
diff -u -N -r1.47 -r1.48
--- openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	13 Jan 2005 13:55:55 -0000	1.47
+++ openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	29 Jan 2005 18:43:28 -0000	1.48
@@ -8,7 +8,7 @@
     @cvs-id defs-procs.tcl,v 1.19.2.2 2003/03/28 13:43:28 lars Exp
 }
 
-ad_proc -public ad_acs_version {} {
+ad_proc -public ad_acs_version_no_cache {} {
     The OpenACS version of this instance. Uses the version name
     of the acs-kernel package.
 
@@ -18,7 +18,15 @@
 
     return $kernel(version_name)
 }
+ad_proc -public ad_acs_version {} {
+    The OpenACS version of this instance. Uses the version name
+    of the acs-kernel package.
 
+    @author Peter Marklund
+} {
+    return [util_memoize ad_acs_version_no_cache]
+}
+
 ad_proc -public ad_acs_release_date {} {
     The OpenACS release date of this instance. Uses the release date
     of the acs-kernel package.
Index: openacs-4/packages/acs-tcl/tcl/object-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/object-procs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-tcl/tcl/object-procs.tcl	26 Jan 2004 15:39:46 -0000	1.5
+++ openacs-4/packages/acs-tcl/tcl/object-procs.tcl	29 Jan 2005 18:43:28 -0000	1.6
@@ -10,16 +10,24 @@
 
 namespace eval acs_object {}
 
+ad_proc -private acs_lookup_magic_object_no_cache { name } {
+    Non memoized version of acs_magic_object.
+
+    @return the magic object's object ID 
+
+    @see acs_magic_object
+} {
+    return [db_string magic_object_select {} ]
+}
+
 ad_proc -private acs_lookup_magic_object { name } {
     Non memoized version of acs_magic_object.
 
     @return the magic object's object ID 
 
     @see acs_magic_object
 } {
-    return [db_string magic_object_select {
-	select object_id from acs_magic_objects where name = :name
-    }]
+    return [util_memoize [list acs_lookup_magic_object_no_cache $name]]
 }
 
 ad_proc -public acs_magic_object { name } {
Index: openacs-4/packages/acs-tcl/tcl/object-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/object-procs.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/tcl/object-procs.xql	24 Apr 2001 06:02:27 -0000	1.1
+++ openacs-4/packages/acs-tcl/tcl/object-procs.xql	29 Jan 2005 18:43:28 -0000	1.2
@@ -1,24 +1,20 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="acs_lookup_magic_object.magic_object_select">      
+<fullquery name="acs_lookup_magic_object_no_cache.magic_object_select">
       <querytext>
-      
 	select object_id from acs_magic_objects where name = :name
-    
       </querytext>
 </fullquery>
 
- 
-<fullquery name="acs_object_type.object_type_select">      
+<fullquery name="acs_object_type.object_type_select">
       <querytext>
-      
+
         select object_type
         from acs_objects
         where object_id = :object_id
-    
+
       </querytext>
 </fullquery>
 
- 
 </queryset>