Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/services/cachemanager_svc.py b/services/cachemanager_svc.py
index 753bffa..8801ef6 100644
--- a/services/cachemanager_svc.py
+++ b/services/cachemanager_svc.py
@@ -1,7 +1,6 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
 
 """A simple in-RAM cache with distributed invalidation.
 
@@ -139,7 +138,7 @@
         cnxn, kind=kind, where=[('timestep < %s', [last_timestep])])
 
 
-class RamCacheConsolidate(jsonfeed.FlaskInternalTask):
+class RamCacheConsolidate(jsonfeed.InternalTask):
   """Drop old Invalidate rows when there are too many of them."""
 
   def HandleRequest(self, mr):