Changed parameter list to allow null values to be stored in cache