Fix tests and added cache create key.