Clean up
baisically cleaning up some
cache changes