Cache get fix