Properly cache different record types