Cache functionality changed