Updated caching to differenciate between list and full list.
Fixed bug in wiggle handler list.
Merge branch 'test' into dev