Removed obsolete method and fixed Cache bug.