added chaching and storage limits