Reduce cache times; Clean up config