Modernizing Models and Management of the Memory Hierarchy for Non-Volatile Memory