Fix critical bug with cache return values.