cache and join fix