Cache Updates

A few small changes, started using caching.