Minor change - added some params as cached params