This reverts commit 1e737a5c50. The cached block list does not include meta-blocks, so we'd end up leaking those. There's definitely a nice way to avoid work here, but it turns out it wasn't quite this trivial. Reverting for now.
1e737a5c50