Fixed basket bugs and MM webcache issues