Added basics for caching/settings