Fixed value caching bug