Switch over to Map/HashMap for RAM cache as well