Change to pass entire Entry instead of pieces of information to fix cache updates