Change cache to include options