Lowered caching time, adjusted some other stuff