Index: openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl,v
diff -u -N -r1.80 -r1.81
--- openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl	29 May 2018 16:32:30 -0000	1.80
+++ openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl	30 May 2018 14:43:29 -0000	1.81
@@ -617,7 +617,10 @@
 
     @param user_id user_id of the user for whom we need the portrait
 } {
-    return [util_memoize [list acs_user::get_portrait_id_not_cached -user_id $user_id] 600]
+    set key [list get_portrait_id -user_id $user_id]
+    return [ns_cache eval user_info_cache $key {
+        acs_user::get_portrait_id_not_cached -user_id $user_id
+    }]
 }
 
 ad_proc -private acs_user::get_portrait_id_not_cached {
@@ -702,7 +705,8 @@
     }
 
     # Flush the portrait cache
-    util_memoize_flush [list acs_user::get_portrait_id_not_cached -user_id $user_id]
+    set key [list get_portrait_id -user_id $user_id]
+    ns_cache flush user_info_cache $key
 }
 
 # Local variables: