Small changes to Connect and Cache