Fixed Cache

Correct Caching