Updated for cache change on the fly