1.5.2: Use plain objects for data caches.