refactored details, attempted cache modifications