Bug Fix (#2)

Fixed bug where cache was not being correctly set, used, or deleted.