Made the cache more context aware