Removed cache dependency to persistance layer