Altering cache clear for now. See issue #2