Minor cleanup to Cache() method