Cleaned up a little bit
Fixed the cache