Fix cache retrieval behavior.