Fix cachability issues