Cached value handling added.