generator cache fixed