Fixes #4013, Caches vanish from lists when storing them