Merge "Use Sim state cache when available"