simplify gencache_iterate a bit, fix nonempty blank lines