Added code for supporting additional caches
Added more code to debug angles