Alex/remove from cache

DO NOT MERGE

This PR is for convenience.
Test will be added.