Keep cache of redirect events
Fix numeric values issue