Fix for 445968: caching
Use generics