Fix one potential issue with cache