Renamed cache handler to storage manager #264