Fix for Ticket #868, Cache Bug