Description of problem: ccm-ldn-shortcuts application uses a c.ad.util.Cache object of size 50 to keep track of URL shortcuts. I think this leads to a problem when you have more than 50 shortcuts whereby some (whichever get deleted when new ones get added) no longer work, i.e. they return a 404 (and the target URL still works fine). Version-Release number of selected component (if applicable): Verified in 5.2 and 6.0 Unsure of nightly. How reproducible: Consistently, but limited testing due to time taken to enter a bazillion shortcuts. Steps to Reproduce: 1. Add shortcut at /shortcuts/admin || /admin/shortcuts 2. GOTO 1 unless ($#shortcuts > 50) 3. Clicky clicky on the oldest shortcuts. Actual results: 404 page referring to the shortcut name (e.g. "/my-shortcut/ not found", rather than "/target-url/ not found") Expected results: Shortcut works, forwards you to intended page. Additional info: