fix fromCache case